5 files changed, 38 insertions, 8 deletions

diff --git a/linden/indra/lscript/lscript_compile/indra.l b/linden/indra/lscript/lscript_compile/indra.l
index c219cec..0beffe5 100644
--- a/linden/indra/lscript/lscript_compile/indra.l
+++ b/linden/indra/lscript/lscript_compile/indra.l
@@ -1,3 +1,4 @@
+
 N                       [0-9]
 L                       [a-zA-Z_]
 H                       [a-fA-F0-9]
@@ -41,6 +42,12 @@ void parse_string();
 #define YYLMAX 16384
 #define YY_NEVER_INTERACTIVE 1 /* stops flex from calling isatty() */
  
+#ifdef ECHO
+#undef ECHO
+#endif
+
+#define ECHO do { } while (0)
+
 #if defined(__cplusplus)
 extern "C" { int yylex( void ); }
 extern "C" { int yyparse( void ); }
@@ -750,7 +757,7 @@ BOOL lscript_compile(char *filename, BOOL is_god_like = FALSE)
 
 S32 yywrap()
 {
-#ifdef FLEX_SCANNER
+#if defined(FLEX_SCANNER) && !defined(LL_WINDOWS)
         // get gcc to stop complaining about lack of use of yyunput
         (void) yyunput;
 #endif
diff --git a/linden/indra/lscript/lscript_compile/indra.y b/linden/indra/lscript/lscript_compile/indra.y
index c7a4fd6..49d0c38 100644
--- a/linden/indra/lscript/lscript_compile/indra.y
+++ b/linden/indra/lscript/lscript_compile/indra.y
@@ -15,6 +15,10 @@
     #define getenv getenv_workaround
     #endif
 
+    #ifdef LL_WINDOWS
+        #pragma warning( disable : 4065 )       // warning: switch statement contains 'default' but no 'case' labels
+        #endif
+
     #ifdef __cplusplus
     }
     #endif
diff --git a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
index a1ea22b..0d75eee 100644
--- a/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_bytecode.cpp
@@ -308,7 +308,10 @@ void LLScriptScriptCodeChunk::build(FILE *efp, FILE *bcfp)
                 set_register(mCompleteCode, LREG_TM, mTotalSize);
 
 
-                fwrite(mCompleteCode, 1, mTotalSize, bcfp);
+                if (fwrite(mCompleteCode, 1, mTotalSize, bcfp) != mTotalSize)
+                {
+                        llwarns << "Short write" << llendl;
+                }
         }
         else
         {
diff --git a/linden/indra/lscript/lscript_execute/lscript_execute.cpp b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
index 2f81416..9e8be15 100644
--- a/linden/indra/lscript/lscript_execute/lscript_execute.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_execute.cpp
@@ -63,11 +63,19 @@ LLScriptExecute::LLScriptExecute(FILE *fp)
         U8  sizearray[4];
         S32 filesize;
         S32 pos = 0;
-        fread(&sizearray, 1, 4, fp);
-        filesize = bytestream2integer(sizearray, pos);
+        if (fread(&sizearray, 1, 4, fp) != 4)
+        {
+                llwarns << "Short read" << llendl;
+                filesize = 0;
+        } else {
+                filesize = bytestream2integer(sizearray, pos);
+        }
         mBuffer = new U8[filesize];
         fseek(fp, 0, SEEK_SET);
-        fread(mBuffer, 1, filesize, fp);
+        if (fread(mBuffer, 1, filesize, fp) != filesize)
+        {
+                llwarns << "Short read" << llendl;
+        }
         fclose(fp);
 
         init();
diff --git a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
index 077e47c..f84abc5 100644
--- a/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
+++ b/linden/indra/lscript/lscript_execute/lscript_readlso.cpp
@@ -37,11 +37,19 @@ LLScriptLSOParse::LLScriptLSOParse(FILE *fp)
         U8  sizearray[4];
         S32 filesize;
         S32 pos = 0;
-        fread(&sizearray, 1, 4, fp);
-        filesize = bytestream2integer(sizearray, pos);
+        if (fread(&sizearray, 1, 4, fp) != 4)
+        {
+                llwarns << "Short read" << llendl;
+                filesize = 0;
+        } else {
+                filesize = bytestream2integer(sizearray, pos);
+        }
         mRawData = new U8[filesize];
         fseek(fp, 0, SEEK_SET);
-        fread(mRawData, 1, filesize, fp);
+        if (fread(mRawData, 1, filesize, fp) != filesize)
+        {
+                llwarns << "Short read" << llendl;
+        }
 
         initOpCodePrinting();
 }