generic-library/ChaiScript
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix some JSON parsing bug with short strings

Browse Source
This commit is contained in:
Jason Turner
2015-09-20 15:46:05 -06:00
parent f9f1d5807a
commit 8024edeadf
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
include/chaiscript/utility/json.hpp
View File

@@ -457,7 +457,7 @@ namespace {
++offset; return Object; ++offset; return Object;
} }
for (;;) { for (;offset<str.size();) {
JSON Key = parse_next( str, offset ); JSON Key = parse_next( str, offset );
consume_ws( str, offset ); consume_ws( str, offset );
if( str[offset] != ':' ) { if( str[offset] != ':' ) {
@@ -494,7 +494,7 @@ namespace {
++offset; return Array; ++offset; return Array;
} }
for (;;) { for (;offset < str.size();) {
Array[index++] = parse_next( str, offset ); Array[index++] = parse_next( str, offset );
consume_ws( str, offset ); consume_ws( str, offset );
@@ -555,7 +555,7 @@ namespace {
char c; char c;
bool isDouble = false; bool isDouble = false;
long exp = 0; long exp = 0;
for (;;) { for (; offset < str.size() ;) {
c = str[offset++]; c = str[offset++];
if( (c == '-') || (c >= '0' && c <= '9') ) if( (c == '-') || (c >= '0' && c <= '9') )
val += c; val += c;
@@ -566,7 +566,7 @@ namespace {
else else
break; break;
} }
if( c == 'E' || c == 'e' ) { if( offset < str.size() && (c == 'E' || c == 'e' )) {
c = str[ offset++ ]; c = str[ offset++ ];
if( c == '-' ){ ++offset; exp_str += '-';} if( c == '-' ){ ++offset; exp_str += '-';}
for (;;) { for (;;) {
@@ -582,7 +582,7 @@ namespace {
} }
exp = std::stol( exp_str ); exp = std::stol( exp_str );
} }
else if( !isspace( c ) && c != ',' && c != ']' && c != '}' ) { else if( offset < str.size() && (!isspace( c ) && c != ',' && c != ']' && c != '}' )) {
std::cerr << "ERROR: Number: unexpected character '" << c << "'\n"; std::cerr << "ERROR: Number: unexpected character '" << c << "'\n";
return JSON::Make( JSON::Class::Null ); return JSON::Make( JSON::Class::Null );
} }
@@ -601,15 +601,16 @@ namespace {
JSON parse_bool( const string &str, size_t &offset ) { JSON parse_bool( const string &str, size_t &offset ) {
JSON Bool; JSON Bool;
if( str.substr( offset, 4 ) == "true" ) if( str.substr( offset, 4 ) == "true" ) {
offset += 4;
Bool = true; Bool = true;
else if( str.substr( offset, 5 ) == "false" ) } else if( str.substr( offset, 5 ) == "false" ) {
offset += 5;
Bool = false; Bool = false;
else { } else {
std::cerr << "ERROR: Bool: Expected 'true' or 'false', found '" << str.substr( offset, 5 ) << "'\n"; std::cerr << "ERROR: Bool: Expected 'true' or 'false', found '" << str.substr( offset, 5 ) << "'\n";
return JSON::Make( JSON::Class::Null ); return JSON::Make( JSON::Class::Null );
} }
offset += (Bool.ToBool() ? 4 : 5);
return Bool; return Bool;
} }