1 files changed, 13 insertions, 10 deletions

diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 921e650..3e5063e 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -3965,6 +3965,7 @@ void force_import_geometry(void*)
                  child = root->getNextNamedChild())
         {
                 // get object data
+                // *NOTE: This buffer size is hard coded into scanf() below.
                 char name[255];                 // Shape
                 char description[255];  // Description
                 U32      material;                      // Material
@@ -3997,9 +3998,9 @@ void force_import_geometry(void*)
                 child->getAttributeString("PCode", &attribute);
                 pcode = atoi(attribute.c_str());
                 child->getAttributeString("Shape", &attribute);
-                sscanf(attribute.c_str(), "%s", name);
+                sscanf(attribute.c_str(), "%254s", name);
                 child->getAttributeString("Description", &attribute);
-                sscanf(attribute.c_str(), "%s", description);
+                sscanf(attribute.c_str(), "%254s", description);
                 child->getAttributeString("Material", &attribute);
                 material = atoi(attribute.c_str());
                 child->getAttributeString("Scale", &attribute);
@@ -4079,6 +4080,7 @@ void force_import_geometry(void*)
                         // read the faces
                         U32 facenumber;
                         LLColor4 color;
+                        // *NOTE: This buffer size is hard coded into scanf() below.
                         char texture[UUID_STR_LENGTH];
                         LLUUID texid;
                         texid.toString(texture);
@@ -4089,7 +4091,7 @@ void force_import_geometry(void*)
                         face->getAttributeString("FaceColor", &attribute);
                         sscanf(attribute, "%d %f %f %f %f", &facenumber, &color.mV[VX], &color.mV[VY], &color.mV[VZ], &color.mV[VW]);
                         face->getAttributeString("Face", &attribute);
-                        sscanf(attribute, "%d %f %f %f %f %f %d %s", &facenumber, &sx, &sy, &ox, &oy, &rot, &bump, texture);
+                        sscanf(attribute, "%d %f %f %f %f %f %d %36s", &facenumber, &sx, &sy, &ox, &oy, &rot, &bump, texture);
                         texid.set(texture);
                         te.setColor(color);
                         te.setBumpShinyFullbright(bump);
@@ -5025,7 +5027,7 @@ const char* upload_pick(void* data)
         LLFilePicker::ELoadFilter type;
         if(data)
         {
-                type = (LLFilePicker::ELoadFilter)((S32)data);
+                type = (LLFilePicker::ELoadFilter)((intptr_t)data);
         }
         else
         {
@@ -5506,7 +5508,8 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  if (fscanf(in, "LindenResource\nversion %d\n", &version))              
                  {              
                          if (2 == version)              
-                         {              
+                         {
+                                                                // *NOTE: This buffer size is hard coded into scanf() below.
                                  char label[MAX_STRING];                
                                  char value[MAX_STRING];                
                                  S32  tokens_read;              
@@ -5514,7 +5517,7 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                                  {              
                                          label[0] = '\0';               
                                          value[0] = '\0';               
-                                         tokens_read = sscanf(buf, "%s %s\n", label, value);            
+                                         tokens_read = sscanf(buf, "%254s %254s\n", label, value);              
 
                                          llinfos << "got: " << label << " = " << value          
                                                          << llendl;             
@@ -5930,7 +5933,7 @@ void handle_export_selected( void * )
 
 BOOL menu_check_build_tool( void* user_data )
 {
-        S32 index = (S32) user_data;
+        S32 index = (intptr_t) user_data;
         return gCurrentToolset->isToolSelected( index );
 }
 
@@ -6223,7 +6226,7 @@ class LLObjectEnableSitOrStand : public view_listener_t
         {
                 bool new_value = false;
                 LLViewerObject* dest_object = NULL;
-                if(dest_object = gObjectList.findObject(gLastHitObjectID))
+                if((dest_object = gObjectList.findObject(gLastHitObjectID)))
                 {
                         if(dest_object->getPCode() == LL_PCODE_VOLUME)
                         {
@@ -8075,7 +8078,7 @@ void handle_debug_avatar_textures(void*)
 
 void handle_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);
+        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {
@@ -8166,7 +8169,7 @@ void handle_grab_texture(void* data)
 
 BOOL enable_grab_texture(void* data)
 {
-        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex) ((U32) data);
+        LLVOAvatar::ETextureIndex index = (LLVOAvatar::ETextureIndex)((intptr_t)data);
         LLVOAvatar* avatar = gAgent.getAvatarObject();
         if ( avatar )
         {