Second Life viewer sources 1.18.1.2

1 files changed, 11 insertions, 5 deletions

diff --git a/linden/indra/newview/llviewermenufile.cpp b/linden/indra/newview/llviewermenufile.cpp
index d0b8c73..4d46a8f 100644
--- a/linden/indra/newview/llviewermenufile.cpp
+++ b/linden/indra/newview/llviewermenufile.cpp
@@ -222,7 +222,7 @@ class LLFileUploadImage : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                const char* filename = upload_pick((void *)(S32)LLFilePicker::FFLOAD_IMAGE);
+                const char* filename = upload_pick((void *)LLFilePicker::FFLOAD_IMAGE);
                 if (filename)
                 {
                         LLFloaterImagePreview* floaterp = new LLFloaterImagePreview(filename);
@@ -236,7 +236,7 @@ class LLFileUploadSound : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_WAV));
+                const char* filename = upload_pick((void*)LLFilePicker::FFLOAD_WAV);
                 if (filename)
                 {
                         LLFloaterNameDesc* floaterp = new LLFloaterNameDesc(filename);
@@ -250,7 +250,7 @@ class LLFileUploadAnim : public view_listener_t
 {
         bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
         {
-                const char* filename = upload_pick((void*)((S32)LLFilePicker::FFLOAD_ANIM));
+                const char* filename = upload_pick((void*)LLFilePicker::FFLOAD_ANIM);
                 if (filename)
                 {
                         LLFloaterAnimPreview* floaterp = new LLFloaterAnimPreview(filename);
@@ -691,7 +691,10 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                          S16     type_num;              
 
                          // read in and throw out most of the header except for the type                
-                         fread(buf, header_size, 1, in);                
+                         if (fread(buf, header_size, 1, in) != 1)
+                                                 {
+                                                         llwarns << "Short read" << llendl;
+                                                 }
                          memcpy(&type_num, buf + 16, sizeof(S16));              /* Flawfinder: ignore */                
                          asset_type = (LLAssetType::EType)type_num;             
                  }              
@@ -702,7 +705,10 @@ void upload_new_resource(const LLString& src_filename, std::string name,
                  {              
                          while((read = fread(buf, 1, 16384, in)))               /* Flawfinder: ignore */                
                          {              
-                                 fwrite(buf, 1, read, out);             /* Flawfinder: ignore */                                
+                                                         if (fwrite(buf, 1, read, out) != read)
+                                                         {
+                                                                 llwarns << "Short write" << llendl;
+                                                         }
                          }              
                          fclose(out);           
                  }