Second Life viewer sources 1.14.0.0

1 files changed, 15 insertions, 4 deletions

diff --git a/linden/indra/newview/lllogchat.cpp b/linden/indra/newview/lllogchat.cpp
index f8b100e..6be5ee1 100644
--- a/linden/indra/newview/lllogchat.cpp
+++ b/linden/indra/newview/lllogchat.cpp
@@ -43,7 +43,13 @@ LLString LLLogChat::makeLogFileName(LLString filename)
 //static
 void LLLogChat::saveHistory(LLString filename, LLString line)
 {
-        FILE *fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a"); 
+        if(!filename.size())
+        {
+                llinfos << "Filename is Empty!" << llendl;
+                return;
+        }
+
+        FILE* fp = LLFile::fopen(LLLogChat::makeLogFileName(filename).c_str(), "a");            /*Flawfinder: ignore*/
         if (!fp)
         {
                 llinfos << "Couldn't open chat history log!" << llendl;
@@ -58,14 +64,19 @@ void LLLogChat::saveHistory(LLString filename, LLString line)
 
 void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*), void* userdata)
 {
-        FILE *fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");
+        if(!filename.size())
+        {
+                llerrs << "Filename is Empty!" << llendl;
+        }
+
+        FILE* fptr = LLFile::fopen(makeLogFileName(filename).c_str(), "r");             /*Flawfinder: ignore*/
         if (!fptr)
         {
                 return;                 //No previous conversation with this name.
         }
         else
         {
-                char buffer[LOG_RECALL_SIZE];
+                char buffer[LOG_RECALL_SIZE];           /*Flawfinder: ignore*/
                 char *bptr;
                 S32 len;
                 bool firstline=TRUE;
@@ -82,7 +93,7 @@ void LLLogChat::loadHistory(LLString filename , void (*callback)(LLString,void*)
 
                 while ( fgets(buffer, LOG_RECALL_SIZE, fptr)  && !feof(fptr) ) 
                 {
-                        len = strlen(buffer) - 1;
+                        len = strlen(buffer) - 1;               /*Flawfinder: ignore*/
                         for ( bptr = (buffer + len); (*bptr == '\n' || *bptr == '\r') && bptr>buffer; bptr--)   *bptr='\0';
                         
                         if (!firstline)