diff options
author | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
---|---|---|
committer | Jacek Antonelli | 2008-08-15 23:45:04 -0500 |
commit | 117e22047c5752352342d64e3fb7ce00a4eb8113 (patch) | |
tree | e32de2cfba0dda8705ae528fcd1fbe23ba075685 /linden/indra/llinventory/llinventory.cpp | |
parent | Second Life viewer sources 1.18.0.6 (diff) | |
download | meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.zip meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.gz meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.bz2 meta-impy-117e22047c5752352342d64e3fb7ce00a4eb8113.tar.xz |
Second Life viewer sources 1.18.1.2
Diffstat (limited to 'linden/indra/llinventory/llinventory.cpp')
-rw-r--r-- | linden/indra/llinventory/llinventory.cpp | 12 |
1 files changed, 10 insertions, 2 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) | |||
535 | mAssetUUID.setNull(); | 535 | mAssetUUID.setNull(); |
536 | while(success && (!feof(fp))) | 536 | while(success && (!feof(fp))) |
537 | { | 537 | { |
538 | fgets(buffer, MAX_STRING, fp); | 538 | if (fgets(buffer, MAX_STRING, fp) == NULL) |
539 | { | ||
540 | buffer[0] = '\0'; | ||
541 | } | ||
542 | |||
539 | sscanf(buffer, " %254s %254s", keyword, valuestr); /* Flawfinder: ignore */ | 543 | sscanf(buffer, " %254s %254s", keyword, valuestr); /* Flawfinder: ignore */ |
540 | if(0 == strcmp("{",keyword)) | 544 | if(0 == strcmp("{",keyword)) |
541 | { | 545 | { |
@@ -1391,7 +1395,11 @@ BOOL LLInventoryCategory::importFile(FILE* fp) | |||
1391 | valuestr[0] = '\0'; | 1395 | valuestr[0] = '\0'; |
1392 | while(!feof(fp)) | 1396 | while(!feof(fp)) |
1393 | { | 1397 | { |
1394 | fgets(buffer, MAX_STRING, fp); | 1398 | if (fgets(buffer, MAX_STRING, fp) == NULL) |
1399 | { | ||
1400 | buffer[0] = '\0'; | ||
1401 | } | ||
1402 | |||
1395 | sscanf( /* Flawfinder: ignore */ | 1403 | sscanf( /* Flawfinder: ignore */ |
1396 | buffer, | 1404 | buffer, |
1397 | " %254s %254s", | 1405 | " %254s %254s", |