Merged in andreykproductengine/maint-neko (pull request #724)

SL-9954 Mac Viewer crashes if logcontrol-dev.xml is modified

Approved-by: Andrey Lihatskiy <andreylproductengine@lindenlab.com>
Approved-by: Simon Linden <simon@lindenlab.com>

indra/llcommon/llerror.cpp

@@ -382,15 +382,22 @@ namespace
 
 		{
 			llifstream file(filename().c_str());
-			if (file.is_open())
+			if (!file.is_open())
 			{
-				LLSDSerialize::fromXML(configuration, file);
+				LL_WARNS() << filename() << " failed to open file; not changing configuration" << LL_ENDL;
+				return false;
+			}
+
+			if (LLSDSerialize::fromXML(configuration, file) == LLSDParser::PARSE_FAILURE)
+			{
+				LL_WARNS() << filename() << " parcing error; not changing configuration" << LL_ENDL;
+				return false;
 			}
 
-			if (configuration.isUndefined())
+			if (configuration.isUndefined() || !configuration.isMap() || configuration.emptyMap())
 			{
-				LL_WARNS() << filename() << " missing, ill-formed,"
-							" or simply undefined; not changing configuration"
+				LL_WARNS() << filename() << " missing, ill-formed, or simply undefined"
+							" content; not changing configuration"
 						<< LL_ENDL;
 				return false;
 			}
@@ -856,12 +863,15 @@ namespace LLError
             setEnabledLogTypesMask(config["enabled-log-types-mask"].asInteger());
         }
         
+        if (config.has("settings") && config["settings"].isArray())
+        {
             LLSD sets = config["settings"];
             LLSD::array_const_iterator a, end;
             for (a = sets.beginArray(), end = sets.endArray(); a != end; ++a)
             {
                 const LLSD& entry = *a;
-			
+                if (entry.isMap() && !entry.emptyMap())
+                {
                     ELevel level = decodeLevel(entry["level"]);
 
                     setLevels(s->mFunctionLevelMap, entry["functions"], level);
@@ -871,6 +881,8 @@ namespace LLError
                 }
             }
         }
+	}
+}
 
 
 namespace LLError