svn merge -r 64548:64837 svn+ssh://svn/svn/linden/branches/maintenance into release

* WARNING *:  maintenance r64837 is not the last rev to use in the next merge. use r65269

1 files changed, 8 insertions, 2 deletions

diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp
index 44f5cbb9db..0038c0cf1c 100644
--- a/indra/newview/llviewermenufile.cpp
+++ b/indra/newview/llviewermenufile.cpp
@@ -671,7 +671,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;	 	
                  }	 	
@@ -682,7 +685,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);	 	
                  }