Second Life viewer sources 1.14.0.0

1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/llui/lltexteditor.cpp b/linden/indra/llui/lltexteditor.cpp
index b0f8b5a..8f22545 100644
--- a/linden/indra/llui/lltexteditor.cpp
+++ b/linden/indra/llui/lltexteditor.cpp
@@ -3782,7 +3782,7 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
         //                      <text without \0> (text may contain ext_char_values)
         //              }\n
 
-        char tbuf[MAX_STRING];
+        char tbuf[MAX_STRING];  /* Flawfinder: ignore */
         
         S32 version = 0;
         instream.getline(tbuf, MAX_STRING);
@@ -3822,11 +3822,16 @@ BOOL LLTextEditor::importBuffer(const LLString& buffer )
         BOOL success = TRUE;
 
         char* text = new char[ text_len + 1];
+        if (text == NULL)
+        {
+                llerrs << "Memory allocation failure." << llendl;                       
+                return FALSE;
+        }
         instream.get(text, text_len + 1, '\0');
         text[text_len] = '\0';
-        if( text_len != (S32)strlen(text) )
+        if( text_len != (S32)strlen(text) )/* Flawfinder: ignore */
         {
-                llwarns << llformat("Invalid text length: %d != %d ",strlen(text),text_len) << llendl;
+                llwarns << llformat("Invalid text length: %d != %d ",strlen(text),text_len) << llendl;/* Flawfinder: ignore */
                 success = FALSE;
         }
 
@@ -3948,6 +3953,8 @@ LLXMLNodePtr LLTextEditor::getXML(bool save_children) const
 
         node->createChild("word_wrap", TRUE)->setBoolValue(mWordWrap);
 
+        node->createChild("hide_scrollbar", TRUE)->setBoolValue(mHideScrollbarForShortDocs);
+
         addColorXML(node, mCursorColor, "cursor_color", "TextCursorColor");
         addColorXML(node, mFgColor, "text_color", "TextFgColor");
         addColorXML(node, mReadOnlyFgColor, "text_readonly_color", "TextFgReadOnlyColor");