Second Life viewer sources 1.13.2.15

6 files changed, 19 insertions, 13 deletions

diff --git a/linden/indra/llmessage/llcachename.cpp b/linden/indra/llmessage/llcachename.cpp
index 9995a6e..3a92812 100644
--- a/linden/indra/llmessage/llcachename.cpp
+++ b/linden/indra/llmessage/llcachename.cpp
@@ -284,6 +284,7 @@ void LLCacheName::importFile(FILE* fp)
         const S32 BUFFER_SIZE = 1024;
         char buffer[BUFFER_SIZE];       /*Flawfinder: ignore*/
 
+        // *NOTE: These buffer sizes are hardcoded into sscanf() below
         char id_string[MAX_STRING]; /*Flawfinder: ignore*/
         char firstname[MAX_STRING]; /*Flawfinder: ignore*/
         char lastname[MAX_STRING]; /*Flawfinder: ignore*/
@@ -293,9 +294,10 @@ void LLCacheName::importFile(FILE* fp)
         char* valid = fgets(buffer, BUFFER_SIZE, fp);
         if (!valid) return;
 
+        // *NOTE: This buffer size is hardcoded into sscanf() below
         char version_string[BUFFER_SIZE]; /*Flawfinder: ignore*/
         S32 version = 0;
-        S32 match = sscanf(buffer, "%s %d", version_string, &version); // XXXTBD
+        S32 match = sscanf(buffer, "%1023s %d", version_string, &version);
         if (   match != 2
                 || strcmp(version_string, "version")
                 || version != CN_FILE_VERSION)
@@ -314,11 +316,13 @@ void LLCacheName::importFile(FILE* fp)
                 valid = fgets(buffer, BUFFER_SIZE, fp);
                 if (!valid) break;
 
-                match = sscanf(buffer, "%s %u %s %s",   // XXXTBD
-                                           id_string, 
-                                           &create_time,
-                                           firstname, 
-                                           lastname);
+                match = sscanf(
+                        buffer,
+                        "%254s %u %254s %254s",
+                        id_string, 
+                        &create_time,
+                        firstname, 
+                        lastname);
                 if (4 != match) continue;
 
                 LLUUID id(id_string);
@@ -409,7 +413,7 @@ BOOL LLCacheName::getName(const LLUUID& id, char* first, char* last)
         {
                 //The function signature needs to change to pass in the
                 //length of first and last.
-                strcpy(first,(frand(1.0f) < HIPPO_PROBABILITY)
+                strcpy(first,(ll_frand() < HIPPO_PROBABILITY)
                                                 ? CN_HIPPOS 
                                                 : CN_WAITING);
                 strcpy(last, "");
diff --git a/linden/indra/llmessage/llcircuit.cpp b/linden/indra/llmessage/llcircuit.cpp
index 7d3136b..5187948 100644
--- a/linden/indra/llmessage/llcircuit.cpp
+++ b/linden/indra/llmessage/llcircuit.cpp
@@ -105,12 +105,12 @@ LLCircuitData::LLCircuitData(const LLHost &host, TPACKETID in_id)
         // Need to guarantee that this time is up to date, we may be creating a circuit even though we haven't been
         //  running a message system loop.
         F64 mt_sec = LLMessageSystem::getMessageTimeSeconds(TRUE);
-        F32 distribution_offset = frand(1.0f);
+        F32 distribution_offset = ll_frand();
         
         mPingTime = mt_sec;
         mLastPingSendTime = mt_sec + PING_INTERVAL * distribution_offset;
         mLastPingReceivedTime = mt_sec;
-        mNextPingSendTime = mLastPingSendTime + 0.95*PING_INTERVAL + frand(0.1f*PING_INTERVAL);
+        mNextPingSendTime = mLastPingSendTime + 0.95*PING_INTERVAL + ll_frand(0.1f*PING_INTERVAL);
         mPeriodTime = mt_sec;
 
         mTimeoutCallback = NULL;
@@ -804,7 +804,7 @@ void LLCircuit::updateWatchDogTimers(LLMessageSystem *msgsys)
                         if (cdp->updateWatchDogTimers(msgsys))
             {
                                 // Randomize our pings a bit by doing some up to 5% early or late
-                                F64 dt = 0.95f*PING_INTERVAL + frand(0.1f*PING_INTERVAL);
+                                F64 dt = 0.95f*PING_INTERVAL + ll_frand(0.1f*PING_INTERVAL);
 
                                 // Remove it, and reinsert it with the new next ping time.
                                 // Always remove before changing the sorting key.
diff --git a/linden/indra/llmessage/llpacketring.cpp b/linden/indra/llmessage/llpacketring.cpp
index 3876d76..6a6a456 100644
--- a/linden/indra/llmessage/llpacketring.cpp
+++ b/linden/indra/llmessage/llpacketring.cpp
@@ -166,7 +166,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
                                 mActualBitsIn += packetp->getSize() * 8;
 
                                 // Fake packet loss
-                                if (mDropPercentage && (frand(100.f) < mDropPercentage))
+                                if (mDropPercentage && (ll_frand(100.f) < mDropPercentage))
                                 {
                                         mPacketsToDrop++;
                                 }
@@ -221,7 +221,7 @@ S32 LLPacketRing::receivePacket (S32 socket, char *datap)
 
                 if (packet_size)  // did we actually get a packet?
                 {
-                        if (mDropPercentage && (frand(100.f) < mDropPercentage))
+                        if (mDropPercentage && (ll_frand(100.f) < mDropPercentage))
                         {
                                 mPacketsToDrop++;
                         }
diff --git a/linden/indra/llmessage/llpumpio.cpp b/linden/indra/llmessage/llpumpio.cpp
index 853a438..b1495f6 100644
--- a/linden/indra/llmessage/llpumpio.cpp
+++ b/linden/indra/llmessage/llpumpio.cpp
@@ -335,6 +335,7 @@ bool LLPumpIO::copyCurrentLinkInfo(links_t& links) const
 void LLPumpIO::pump()
 {
         LLMemType m1(LLMemType::MTYPE_IO_PUMP);
+        LLFastTimer t1(LLFastTimer::FTM_PUMP);
         //llinfos << "LLPumpIO::pump()" << llendl;
 
         // Run any pending runners.
diff --git a/linden/indra/llmessage/llurlrequest.cpp b/linden/indra/llmessage/llurlrequest.cpp
index c0d8d27..8ac8d94 100644
--- a/linden/indra/llmessage/llurlrequest.cpp
+++ b/linden/indra/llmessage/llurlrequest.cpp
@@ -270,6 +270,7 @@ LLIOPipe::EStatus LLURLRequest::process_impl(
                 S32 queue;
                 do
                 {
+                        LLFastTimer t2(LLFastTimer::FTM_CURL);
                         code = curl_multi_perform(mDetail->mCurlMulti, &queue);                 
                 }while((CURLM_CALL_MULTI_PERFORM == code) && (queue > 0) && count--);
                 CURLMsg* curl_msg;
diff --git a/linden/indra/llmessage/llxfermanager.cpp b/linden/indra/llmessage/llxfermanager.cpp
index d10c879..afeeef3 100644
--- a/linden/indra/llmessage/llxfermanager.cpp
+++ b/linden/indra/llmessage/llxfermanager.cpp
@@ -1108,7 +1108,7 @@ void process_request_xfer(LLMessageSystem *mesgsys, void **user_data)
 void continue_file_receive(LLMessageSystem *mesgsys, void **user_data)
 {
 #if LL_TEST_XFER_REXMIT
-        if (frand(1.f) > 0.05f)
+        if (ll_frand() > 0.05f)
         {
 #endif
                 gXferManager->processReceiveData(mesgsys,user_data);