Second Life viewer sources 1.14.0.0

1 files changed, 5 insertions, 4 deletions

diff --git a/linden/indra/newview/llimpanel.cpp b/linden/indra/newview/llimpanel.cpp
index 317283c..088d601 100644
--- a/linden/indra/newview/llimpanel.cpp
+++ b/linden/indra/newview/llimpanel.cpp
@@ -263,7 +263,7 @@ BOOL LLFloaterIMPanel::addParticipants(const LLDynamicArray<LLUUID>& ids)
                         U8* pos = bucket;
                         for(S32 i = 0; i < count; ++i)
                         {
-                                memcpy(pos, &(ids.get(i)), UUID_BYTES);
+                                memcpy(pos, &(ids.get(i)), UUID_BYTES);         /* Flawfinder: ignore */
                                 pos += UUID_BYTES;
                         }
                         msg->addBinaryDataFast(_PREHASH_BinaryBucket, bucket, bucket_size);
@@ -611,7 +611,7 @@ void LLFloaterIMPanel::onInputEditorKeystroke(LLLineEditor* caller, void* userda
         }
 }
 
-void LLFloaterIMPanel::close(bool app_quitting)
+void LLFloaterIMPanel::onClose(bool app_quitting)
 {
         setTyping(FALSE);
 
@@ -685,8 +685,9 @@ void LLFloaterIMPanel::sendMsg()
                         gAgent.buildFullname(history_echo);
 
                         // Look for IRC-style emotes here.
-                        char tmpstr[5];
-                        strcpy(tmpstr,utf8_text.substr(0,4).c_str());
+                        char tmpstr[5];         /* Flawfinder: ignore */
+                        strncpy(tmpstr,utf8_text.substr(0,4).c_str(), sizeof(tmpstr) -1);               /* Flawfinder: ignore */
+                        tmpstr[sizeof(tmpstr) -1] = '\0';
                         if (!strncmp(tmpstr, "/me ", 4) || !strncmp(tmpstr, "/me'", 4))
                         {
                                 utf8_text.replace(0,3,"");