summaryrefslogtreecommitdiff
path: root/indra/newview/llinventorymodel.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2007-01-24 20:21:23 +0000
committerSteven Bennetts <steve@lindenlab.com>2007-01-24 20:21:23 +0000
commitad94bca0d273869d6358719f4dbd515a905acd26 (patch)
tree52ae9f056f3dd6a938434d45d5295aef87e77e0a /indra/newview/llinventorymodel.cpp
parent787ac69d75dbbd8ad79c32a5de54603351523eae (diff)
merge -r 56696:57082 Branch_1-13-2
Diffstat (limited to 'indra/newview/llinventorymodel.cpp')
-rw-r--r--indra/newview/llinventorymodel.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp
index cf9ae97b5f..0392b38aec 100644
--- a/indra/newview/llinventorymodel.cpp
+++ b/indra/newview/llinventorymodel.cpp
@@ -1947,11 +1947,12 @@ bool LLInventoryModel::loadFromFile(
llinfos << "unable to load inventory from: " << filename << llendl;
return false;
}
+ // *NOTE: This buffer size is hard coded into scanf() below.
char buffer[MAX_STRING];
char keyword[MAX_STRING];
while(!feof(file) && fgets(buffer, MAX_STRING, file))
{
- sscanf(buffer, " %s", keyword);
+ sscanf(buffer, " %254s", keyword);
if(0 == strcmp("inv_category", keyword))
{
LLPointer<LLViewerInventoryCategory> inv_cat = new LLViewerInventoryCategory(LLUUID::null);