1 files changed, 20 insertions, 10 deletions

diff --git a/linden/indra/llinventory/llinventory.cpp b/linden/indra/llinventory/llinventory.cpp
index 1f7efb3..3235748 100644
--- a/linden/indra/llinventory/llinventory.cpp
+++ b/linden/indra/llinventory/llinventory.cpp
@@ -320,6 +320,8 @@ void LLInventoryObject::setType(LLAssetType::EType type)
 // virtual
 BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
 {
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -358,7 +360,7 @@ BOOL LLInventoryObject::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s %[^|]", keyword, valuestr);
+                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -681,6 +683,8 @@ BOOL LLInventoryItem::unpackMessage(LLMessageSystem* msg, const char* block, S32
 // virtual
 BOOL LLInventoryItem::importFile(FILE* fp)
 {
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -769,7 +773,7 @@ BOOL LLInventoryItem::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %254s%[\t]%[^|]", keyword, junk, valuestr);
+                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
 
                         // IW: sscanf chokes and puts | in valuestr if there's no name
                         if (valuestr[0] == '|')
@@ -785,7 +789,7 @@ BOOL LLInventoryItem::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s%[\t]%[^|]", keyword, junk, valuestr);
+                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
 
                         if (valuestr[0] == '|')
                         {
@@ -875,6 +879,8 @@ BOOL LLInventoryItem::exportFile(FILE* fp, BOOL include_asset_key) const
 // virtual
 BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
 {
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -889,7 +895,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
         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;
@@ -963,7 +969,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s%[\t]%[^|]", keyword, junk, valuestr);
+                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
 
                         // IW: sscanf chokes and puts | in valuestr if there's no name
                         if (valuestr[0] == '|')
@@ -979,7 +985,7 @@ BOOL LLInventoryItem::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s%[\t]%[^|]", keyword, junk, valuestr);
+                        sscanf(buffer, " %254s%254[\t]%254[^|]", keyword, junk, valuestr);
 
                         if (valuestr[0] == '|')
                         {
@@ -1522,6 +1528,8 @@ void LLInventoryCategory::unpackMessage(LLMessageSystem* msg,
 // virtual
 BOOL LLInventoryCategory::importFile(FILE* fp)
 {
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -1531,7 +1539,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
         while(!feof(fp))
         {
                 fgets(buffer, MAX_STRING, fp);
-                sscanf(buffer, " %s %s", keyword, valuestr);
+                sscanf(buffer, " %254s %254s", keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -1564,7 +1572,7 @@ BOOL LLInventoryCategory::importFile(FILE* fp)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s %[^|]", keyword, valuestr);
+                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');
@@ -1597,6 +1605,8 @@ BOOL LLInventoryCategory::exportFile(FILE* fp, BOOL) const
 // virtual
 BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
 {
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char buffer[MAX_STRING];
         char keyword[MAX_STRING];
         char valuestr[MAX_STRING];
@@ -1606,7 +1616,7 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
         while(input_stream.good())
         {
                 input_stream.getline(buffer, MAX_STRING);
-                sscanf(buffer, " %s %s", keyword, valuestr);
+                sscanf(buffer, " %254s %254s", keyword, valuestr);
                 if(!keyword)
                 {
                         continue;
@@ -1639,7 +1649,7 @@ BOOL LLInventoryCategory::importLegacyStream(std::istream& input_stream)
                 {
                         //strcpy(valuestr, buffer + strlen(keyword) + 3);
                         // *NOTE: Not ANSI C, but widely supported.
-                        sscanf(buffer, " %s %[^|]", keyword, valuestr);
+                        sscanf(buffer, " %254s %254[^|]", keyword, valuestr);
                         mName.assign(valuestr);
                         LLString::replaceNonstandardASCII(mName, ' ');
                         LLString::replaceChar(mName, '|', ' ');