3 files changed, 20 insertions, 4 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 93c480e..3800de2 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -535,7 +535,11 @@ BOOL LLInventoryItem::importFile(FILE* fp)
         mAssetUUID.setNull();
         while(success && (!feof(fp)))
         {
-                fgets(buffer, MAX_STRING, fp);
+                if (fgets(buffer, MAX_STRING, fp) == NULL)
+                {
+                        buffer[0] = '\0';
+                }
+                
                 sscanf(buffer, " %254s %254s", keyword, valuestr);      /* Flawfinder: ignore */
                 if(0 == strcmp("{",keyword))
                 {
@@ -1391,7 +1395,11 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
         valuestr[0] = '\0';
         while(!feof(fp))
         {
-                fgets(buffer, MAX_STRING, fp);
+                if (fgets(buffer, MAX_STRING, fp) == NULL)
+                {
+                        buffer[0] = '\0';
+                }
+                
                 sscanf( /* Flawfinder: ignore */
                         buffer,
                         " %254s %254s",
diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index ae4360a..925b68f 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -526,7 +526,11 @@ BOOL LLPermissions::importFile(FILE* fp)
 
         while (!feof(fp))
         {
-                fgets(buffer, BUFSIZE, fp);
+                if (fgets(buffer, BUFSIZE, fp) == NULL)
+                {
+                        buffer[0] = '\0';
+                }
+                
                 sscanf( /* Flawfinder: ignore */
                         buffer,
                         " %255s %255s",
diff --git a/linden/indra/llinventory/llsaleinfo.cpp b/linden/indra/llinventory/llsaleinfo.cpp
index debb092..0258259 100644
--- a/linden/indra/llinventory/llsaleinfo.cpp
+++ b/linden/indra/llinventory/llsaleinfo.cpp
@@ -170,7 +170,11 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask)
         valuestr[0] = '\0';
         while(success && (!feof(fp)))
         {
-                fgets(buffer, MAX_STRING, fp);
+                if (fgets(buffer, MAX_STRING, fp) == NULL)
+                {
+                        buffer[0] = '\0';
+                }
+
                 sscanf( /* Flawfinder: ignore */
                         buffer,
                         " %254s %254s",