j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

🔨 fixed bugs introduced by merging from develop

Browse source
This commit is contained in:
Niels Lohmann 2017-03-29 07:54:26 +02:00
parent a690a9f2d2
commit 60057a4728
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/json.hpp
View file

@ -7390,7 +7390,7 @@ class basic_json
JSON_DEPRECATED JSON_DEPRECATED
friend std::istream& operator<<(basic_json& j, std::istream& i) friend std::istream& operator<<(basic_json& j, std::istream& i)
{ {
j = parser(i).parse(); j = parser(i).parse(true);
return i; return i;
} }
@ -7422,7 +7422,7 @@ class basic_json
*/ */
friend std::istream& operator>>(std::istream& i, basic_json& j) friend std::istream& operator>>(std::istream& i, basic_json& j)
{ {
j = parser(i).parse(false); j = parser(i).parse(true);
return i; return i;
} }

2
test/src/unit-regression.cpp
View file

@ -596,7 +596,7 @@ TEST_CASE("regression tests")
// a parse error because of the EOF. // a parse error because of the EOF.
CHECK_THROWS_AS(ss >> j, json::parse_error); CHECK_THROWS_AS(ss >> j, json::parse_error);
CHECK_THROWS_WITH(ss >> j, CHECK_THROWS_WITH(ss >> j,
"[json.exception.parse_error.101] parse error at 1: parse error - unexpected end of input"); "[json.exception.parse_error.101] parse error at 1: syntax error - unexpected end of input");
} }
SECTION("issue #389 - Integer-overflow (OSS-Fuzz issue 267)") SECTION("issue #389 - Integer-overflow (OSS-Fuzz issue 267)")