Ticket #3990: t3990_allow_empty_strings_in_config_v1.patch

source/ps/ConfigDB.cpp

@@ -334 +334 @@
                 case '\r':
                 case '\t':
                     break; // ignore
 
                 case ',':
-                    if (!value.empty())
-                        values.push_back(value);
+                    values.push_back(value);
                     value.clear();
                     break;
 
                 default:
                     value.push_back(*pos);
                     break;
                 }
             }
             if (quoted) // We ignore the invalid parameter
                 LOGERROR("Unmatched quote while parsing config file '%s' on line %d", m_ConfigFile[ns].string8(), line);
-            else if (!value.empty())
-                values.push_back(value);
+
+            values.push_back(value);
             value.clear();
             quoted = false;
             break; // We are either at the end of the line, or we still have a comment to parse
 
         default:
@@ -361 +360 @@
 
         // Consume the rest of the line
         while (pos < filebufend && *pos != '\n')
             ++pos;
         // Store the setting
-        if (!name.empty() && !values.empty())
+        if (!name.empty())
         {
             CStr key(header + name);
             newMap[key] = values;
             if (key == "lobby.password")
                 LOGMESSAGE("Loaded config string \"%s\"", key);
@@ -376 +375 @@
                     vals += "\"" + EscapeString(newMap[key][i]) + "\", ";
                 vals += "\"" + EscapeString(newMap[key][values.size()-1]) + "\"";
                 LOGMESSAGE("Loaded config string \"%s\" = %s", key, vals);
             }
         }
-        else if (!name.empty())
-            LOGERROR("Encountered config setting '%s' without value while parsing '%s' on line %d", name, m_ConfigFile[ns].string8(), line);
 
         name.clear();
         values.clear();
         ++line;
     }