Author: aschnell Date: Wed Nov 28 15:23:56 2007 New Revision: 7961 URL: http://svn.opensuse.org/viewcvs/zypp?rev=7961&view=rev Log: - make IniParser more strict (bug #306697) Modified: trunk/libzypp/package/libzypp.changes trunk/libzypp/zypp/parser/IniParser.cc Modified: trunk/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/package/libzypp.changes?rev=7961&r1=7960&r2=7961&view=diff ============================================================================== --- trunk/libzypp/package/libzypp.changes (original) +++ trunk/libzypp/package/libzypp.changes Wed Nov 28 15:23:56 2007 @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Nov 28 15:12:33 CET 2007 - aschnell@suse.de + +- make IniParser more strict (bug #306697) + +------------------------------------------------------------------- Mon Nov 26 13:19:34 CET 2007 - ma@suse.de - Fix missing packages in patch content list. (#340896) Modified: trunk/libzypp/zypp/parser/IniParser.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/parser/IniParser.cc?rev=7961&r1=7960&r2=7961&view=diff ============================================================================== --- trunk/libzypp/zypp/parser/IniParser.cc (original) +++ trunk/libzypp/zypp/parser/IniParser.cc Wed Nov 28 15:23:56 2007 @@ -95,9 +95,18 @@ if (pos != std::string::npos) { 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); } + else + { + std::string msg = str::form("%s: Line %d is missing '=' sign", _inputname.c_str(), line.lineNo()); + ZYPP_THROW(ParseException(msg)); + } // set progress and allow cancel if ( ! ticks.set( input_r.stream().tellg() ) ) -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org