Imported Upstream version 14.30.0

[platform/upstream/libzypp.git] / zypp / parser / IniParser.cc

diff --git a/zypp/parser/IniParser.cc b/zypp/parser/IniParser.cc
index f58264a..cdead1e 100644 (file)
--- a/zypp/parser/IniParser.cc
+++ b/zypp/parser/IniParser.cc
@@ -30,6 +30,14 @@ namespace zypp
 namespace parser
 { /////////////////////////////////////////////////////////////////
 
+  namespace {
+    inline const std::string & keyGarbage()
+    {
+      static const std::string & _val( ",|/\\" );
+      return _val;
+    }
+  } //namespace
+
 ///////////////////////////////////////////////////////////////////
 //
 //     METHOD NAME : IniParser::IniParser
@@ -59,6 +67,13 @@ void IniParser::consume( const std::string &section )
 void IniParser::endParse()
 {}
 
+void IniParser::garbageLine( const std::string &section, const std::string &line )
+{
+  std::string msg = str::form("%s: Section [%s]: Line %d contains garbage (no '=' or '%s' in key)",
+                             _inputname.c_str(), section.c_str(), _line_nr, keyGarbage().c_str());
+  ZYPP_THROW(ParseException(msg));
+}
+
 ///////////////////////////////////////////////////////////////////
 //
 //     METHOD NAME : IniParser::parse
@@ -84,28 +99,32 @@ void IniParser::parse( const InputStream & input_r, const ProgressData::Receiver
 
     if (trimmed[0] == '[')
     {
-      std::string section = trimmed.substr(1, trimmed.find(']')-1);
-      consume(section);
-      section.swap(_current_section);
+      std::string::size_type pos = trimmed.find(']');
+      if ( pos != std::string::npos )
+      {
+       std::string section = trimmed.substr(1, pos-1);
+       consume(section);
+       section.swap(_current_section);
+      }
+      else
+      {
+       _line_nr = line.lineNo();
+       garbageLine( _current_section, trimmed );
+      }
       continue;
     }
 
     std::string::size_type pos = trimmed.find('=');
-
-    if (pos != std::string::npos)
+    if ( pos == std::string::npos || trimmed.find_first_of( keyGarbage() ) < pos )
     {
-      std::string key = str::rtrim(trimmed.substr(0, pos));
-      if(key.find_first_of(" \t") != std::string::npos) {
-       std::string msg = str::form("%s: Key in line %d contains whitespace", _inputname.c_str(), line.lineNo());
-       ZYPP_THROW(ParseException(msg));
-      }
-      std::string value = str::ltrim(trimmed.substr(pos+1));
-      consume( _current_section, key, value);
+      _line_nr = line.lineNo();
+      garbageLine( _current_section, trimmed );        // may or may not throw
     }
     else
     {
-      std::string msg = str::form("%s: Line %d is missing '=' sign", _inputname.c_str(), line.lineNo());
-      ZYPP_THROW(ParseException(msg));
+      std::string key = str::rtrim(trimmed.substr(0, pos));
+      std::string value = str::ltrim(trimmed.substr(pos+1));
+      consume( _current_section, key, value);
     }
 
     // set progress and allow cancel