Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
J
json
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
json
Commits
60057a47
Unverified
Commit
60057a47
authored
Mar 29, 2017
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🔨
fixed bugs introduced by merging from develop
parent
a690a9f2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
json.hpp
src/json.hpp
+2
-2
unit-regression.cpp
test/src/unit-regression.cpp
+1
-1
No files found.
src/json.hpp
View file @
60057a47
...
...
@@ -7390,7 +7390,7 @@ class basic_json
JSON_DEPRECATED
friend
std
::
istream
&
operator
<<
(
basic_json
&
j
,
std
::
istream
&
i
)
{
j
=
parser
(
i
).
parse
();
j
=
parser
(
i
).
parse
(
true
);
return
i
;
}
...
...
@@ -7422,7 +7422,7 @@ class basic_json
*/
friend
std
::
istream
&
operator
>>
(
std
::
istream
&
i
,
basic_json
&
j
)
{
j
=
parser
(
i
).
parse
(
fals
e
);
j
=
parser
(
i
).
parse
(
tru
e
);
return
i
;
}
...
...
test/src/unit-regression.cpp
View file @
60057a47
...
...
@@ -596,7 +596,7 @@ TEST_CASE("regression tests")
// a parse error because of the EOF.
CHECK_THROWS_AS
(
ss
>>
j
,
json
::
parse_error
);
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)"
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment