diff options
| author | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
|---|---|---|
| committer | Steven Bennetts <steve@lindenlab.com> | 2007-01-24 20:21:23 +0000 |
| commit | ad94bca0d273869d6358719f4dbd515a905acd26 (patch) | |
| tree | 52ae9f056f3dd6a938434d45d5295aef87e77e0a /indra/llinventory/llsaleinfo.cpp | |
| parent | 787ac69d75dbbd8ad79c32a5de54603351523eae (diff) | |
merge -r 56696:57082 Branch_1-13-2
Diffstat (limited to 'indra/llinventory/llsaleinfo.cpp')
| -rw-r--r-- | indra/llinventory/llsaleinfo.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/indra/llinventory/llsaleinfo.cpp b/indra/llinventory/llsaleinfo.cpp index 7e2b293d42..2bfac4d3e7 100644 --- a/indra/llinventory/llsaleinfo.cpp +++ b/indra/llinventory/llsaleinfo.cpp @@ -139,6 +139,8 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask) { has_perm_mask = FALSE; + // *NOTE: Changing the buffer size will require changing the scanf + // calls below. char buffer[MAX_STRING]; char keyword[MAX_STRING]; char valuestr[MAX_STRING]; @@ -149,7 +151,7 @@ BOOL LLSaleInfo::importFile(FILE* fp, BOOL& has_perm_mask, U32& perm_mask) while(success && (!feof(fp))) { fgets(buffer, MAX_STRING, fp); - sscanf(buffer, " %s %s", keyword, valuestr); + sscanf(buffer, " %254s %254s", keyword, valuestr); if(!keyword) { continue; @@ -190,6 +192,8 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m { has_perm_mask = FALSE; + // *NOTE: Changing the buffer size will require changing the scanf + // calls below. char buffer[MAX_STRING]; char keyword[MAX_STRING]; char valuestr[MAX_STRING]; @@ -200,7 +204,7 @@ BOOL LLSaleInfo::importLegacyStream(std::istream& input_stream, BOOL& has_perm_m while(success && input_stream.good()) { input_stream.getline(buffer, MAX_STRING); - sscanf(buffer, " %s %s", keyword, valuestr); + sscanf(buffer, " %254s %254s", keyword, valuestr); if(!keyword) { continue; |