1 files changed, 14 insertions, 10 deletions

diff --git a/linden/indra/llinventory/llpermissions.cpp b/linden/indra/llinventory/llpermissions.cpp
index 39e7a72..35dbc3e 100644
--- a/linden/indra/llinventory/llpermissions.cpp
+++ b/linden/indra/llinventory/llpermissions.cpp
@@ -511,6 +511,8 @@ BOOL LLPermissions::importFile(FILE *fp)
         init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
         const S32 BUFSIZE = 16384;
 
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char    buffer[BUFSIZE];
         char    keyword[256];
         char    valuestr[256];
@@ -523,7 +525,7 @@ BOOL LLPermissions::importFile(FILE *fp)
         while (!feof(fp))
         {
                 fgets(buffer, BUFSIZE, fp);
-                sscanf(buffer, " %s %s", keyword, valuestr);
+                sscanf(buffer, " %255s %255s", keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -571,22 +573,22 @@ BOOL LLPermissions::importFile(FILE *fp)
                 }
                 else if (!strcmp("creator_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mCreator.set(uuid_str);
                 }
                 else if (!strcmp("owner_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mOwner.set(uuid_str);
                 }
                 else if (!strcmp("last_owner_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mLastOwner.set(uuid_str);
                 }
                 else if (!strcmp("group_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mGroup.set(uuid_str);
                 }
                 else if (!strcmp("group_owned", keyword))
@@ -644,6 +646,8 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
         init(LLUUID::null, LLUUID::null, LLUUID::null, LLUUID::null);
         const S32 BUFSIZE = 16384;
 
+        // *NOTE: Changing the buffer size will require changing the scanf
+        // calls below.
         char    buffer[BUFSIZE];
         char    keyword[256];
         char    valuestr[256];
@@ -656,7 +660,7 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
         while (input_stream.good())
         {
                 input_stream.getline(buffer, BUFSIZE);
-                sscanf(buffer, " %s %s", keyword, valuestr);
+                sscanf(buffer, " %255s %255s", keyword, valuestr);
                 if (!keyword)
                 {
                         continue;
@@ -704,22 +708,22 @@ BOOL LLPermissions::importLegacyStream(std::istream& input_stream)
                 }
                 else if (!strcmp("creator_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mCreator.set(uuid_str);
                 }
                 else if (!strcmp("owner_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mOwner.set(uuid_str);
                 }
                 else if (!strcmp("last_owner_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mLastOwner.set(uuid_str);
                 }
                 else if (!strcmp("group_id", keyword))
                 {
-                        sscanf(valuestr, "%s", uuid_str);
+                        sscanf(valuestr, "%255s", uuid_str);
                         mGroup.set(uuid_str);
                 }
                 else if (!strcmp("group_owned", keyword))