1 files changed, 21 insertions, 9 deletions

diff --git a/linden/indra/llcommon/llsdserialize.cpp b/linden/indra/llcommon/llsdserialize.cpp
index a556d5d..d42842d 100644
--- a/linden/indra/llcommon/llsdserialize.cpp
+++ b/linden/indra/llcommon/llsdserialize.cpp
@@ -37,7 +37,7 @@
 #include "llstreamtools.h" // for fullread
 
 #include <iostream>
-#include "apr-1/apr_base64.h"
+#include "apr_base64.h"
 
 #if !LL_WINDOWS
 #include <netinet/in.h> // htonl & ntohl
@@ -146,12 +146,15 @@ bool LLSDSerialize::deserialize(LLSD& sd, std::istream& str, S32 max_bytes)
          * Create the parser as appropriate
          */
         if (legacy_no_header)
-        {
-                LLSDXMLParser* x = new LLSDXMLParser;
-                x->parsePart(hdr_buf, inbuf);
-                p = x;
+        {       // Create a LLSD XML parser, and parse the first chunk read above
+                LLSDXMLParser* x = new LLSDXMLParser();
+                x->parsePart(hdr_buf, inbuf);   // Parse the first part that was already read
+                x->parseLines(str, sd);                 // Parse the rest of it
+                delete x;
+                return true;
         }
-        else if (header == LLSD_BINARY_HEADER)
+
+        if (header == LLSD_BINARY_HEADER)
         {
                 p = new LLSDBinaryParser;
         }
@@ -300,7 +303,8 @@ static const char BINARY_FALSE_SERIAL = '0';
 /**
  * LLSDParser
  */
-LLSDParser::LLSDParser() : mCheckLimits(true), mMaxBytesLeft(0)
+LLSDParser::LLSDParser()
+        : mCheckLimits(true), mMaxBytesLeft(0), mParseLines(false)
 {
 }
 
@@ -316,6 +320,15 @@ S32 LLSDParser::parse(std::istream& istr, LLSD& data, S32 max_bytes)
 }
 
 
+// Parse using routine to get() lines, faster than parse()
+S32 LLSDParser::parseLines(std::istream& istr, LLSD& data)
+{
+        mCheckLimits = false;
+        mParseLines = false;            // was true, Emergency fix DEV-17785 parsing newline failure
+        return doParse(istr, data);
+}
+
+
 int LLSDParser::get(std::istream& istr) const
 {
         if(mCheckLimits) --mMaxBytesLeft;
@@ -1217,8 +1230,7 @@ void LLSDFormatter::realFormat(const std::string& format)
 
 void LLSDFormatter::formatReal(LLSD::Real real, std::ostream& ostr) const
 {
-        char buffer[MAX_STRING];                /* Flawfinder: ignore */
-        snprintf(buffer, MAX_STRING, mRealFormat.c_str(), real);        /* Flawfinder: ignore */
+        std::string buffer = llformat(mRealFormat.c_str(), real);
         ostr << buffer;
 }