Second Life viewer sources 1.18.1.2

3 files changed, 15 insertions, 4 deletions

diff --git a/linden/indra/llxml/llxmlnode.cpp b/linden/indra/llxml/llxmlnode.cpp
index bdbb606..8a267a5 100644
--- a/linden/indra/llxml/llxmlnode.cpp
+++ b/linden/indra/llxml/llxmlnode.cpp
@@ -580,11 +580,11 @@ bool LLXMLNode::parseFile(
         fseek(fp, 0, SEEK_SET);
 
         U8* buffer = new U8[length+1];
-        fread(buffer, 1, length, fp);
-        buffer[length] = 0;
+        size_t nread = fread(buffer, 1, length, fp);
+        buffer[nread] = 0;
         fclose(fp);
 
-        bool rv = parseBuffer(buffer, length, node, defaults_tree);
+        bool rv = parseBuffer(buffer, nread, node, defaults_tree);
         delete [] buffer;
         return rv;
 }
@@ -754,7 +754,10 @@ void LLXMLNode::writeToFile(FILE *fOut, LLString indent)
         std::ostringstream ostream;
         writeToOstream(ostream, indent);
         LLString outstring = ostream.str();
-        fwrite(outstring.c_str(), 1, outstring.length(), fOut);
+        if (fwrite(outstring.c_str(), 1, outstring.length(), fOut) != outstring.length())
+        {
+                llwarns << "Short write" << llendl;
+        }
 }
 
 void LLXMLNode::writeToOstream(std::ostream& output_stream, const LLString& indent)
diff --git a/linden/indra/llxml/llxmlnode.h b/linden/indra/llxml/llxmlnode.h
index 3c338e2..e0e8f2f 100644
--- a/linden/indra/llxml/llxmlnode.h
+++ b/linden/indra/llxml/llxmlnode.h
@@ -30,7 +30,11 @@
 #define LL_LLXMLNODE_H
 
 #define XML_STATIC
+#ifdef LL_STANDALONE
+#include <expat.h>
+#else
 #include "expat/expat.h"
+#endif
 #include <map>
 
 #include "indra_constants.h"
diff --git a/linden/indra/llxml/llxmlparser.h b/linden/indra/llxml/llxmlparser.h
index 307a34f..7904175 100644
--- a/linden/indra/llxml/llxmlparser.h
+++ b/linden/indra/llxml/llxmlparser.h
@@ -30,7 +30,11 @@
 #define LL_LLXMLPARSER_H
 
 #define XML_STATIC
+#ifdef LL_STANDALONE
+#include <expat.h>
+#else
 #include "expat/expat.h"
+#endif
 
 class LLXmlParser
 {