diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-03 09:42:03 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-03 12:18:40 +0200 |
| commit | 4e157fc60dae5ca69933ea4c1585a2a078b4d957 (patch) | |
| tree | aa97c939b76802d946b9c3f06351f1fdfcca1579 /src/json/json_spirit_reader_template.h | |
| parent | f00b62391b9317bf4c83676520fede1fb4027c43 (diff) | |
json: fail read_string if string contains trailing garbage
Change `read_string` to fail when not the entire input has been
consumed. This avoids unexpected, even dangerous behavior (fixes #6223).
The new JSON parser adapted in #6121 also solves this problem so in
master this is a temporary fix, but should be backported to older releases.
Also adds tests for the new behavior.
Diffstat (limited to 'src/json/json_spirit_reader_template.h')
| -rw-r--r-- | src/json/json_spirit_reader_template.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/json/json_spirit_reader_template.h b/src/json/json_spirit_reader_template.h index 46f5892f62..47e3c1ca84 100644 --- a/src/json/json_spirit_reader_template.h +++ b/src/json/json_spirit_reader_template.h @@ -521,12 +521,11 @@ namespace json_spirit const spirit_namespace::parse_info< Iter_type > info = spirit_namespace::parse( begin, end, - Json_grammer< Value_type, Iter_type >( semantic_actions ), + Json_grammer< Value_type, Iter_type >( semantic_actions ) >> spirit_namespace::end_p, spirit_namespace::space_p ); if( !info.hit ) { - assert( false ); // in theory exception should already have been thrown throw_error( info.stop, "error" ); } @@ -570,7 +569,8 @@ namespace json_spirit { typename String_type::const_iterator begin = s.begin(); - return read_range( begin, s.end(), value ); + bool success = read_range( begin, s.end(), value ); + return success && begin == s.end(); } template< class Istream_type > |