Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
J
json
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
json
Commits
99185230
Unverified
Commit
99185230
authored
Mar 09, 2018
by
Niels Lohmann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
📝
cleanup after #1001
parent
e737de89
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
84 additions
and
85 deletions
+84
-85
README.md
README.md
+1
-0
test/src/unit-class_parser.cpp
test/src/unit-class_parser.cpp
+0
-85
test/src/unit-regression.cpp
test/src/unit-regression.cpp
+83
-0
No files found.
README.md
View file @
99185230
...
...
@@ -974,6 +974,7 @@ I deeply appreciate the help of the following people.
-
[
johnfb
](
https://github.com/johnfb
)
found a bug in the implementation of CBOR's indefinite length strings.
-
[
Paul Fultz II
](
https://github.com/pfultz2
)
added a note on the cget package manager.
-
[
Wilson Lin
](
https://github.com/wla80
)
made the integration section of the README more concise.
-
[
RalfBielig
](
https://github.com/ralfbielig
)
detected and fixed a memory leak in the parser callback.
Thanks a lot for helping out! Please
[
let me know
](
mailto:mail@nlohmann.me
)
if I forgot someone.
...
...
test/src/unit-class_parser.cpp
View file @
99185230
...
...
@@ -1415,91 +1415,6 @@ TEST_CASE("parser class")
});
CHECK
(
j_empty_array
==
json
());
}
/*
SECTION("skip in GeoJSON")
{
auto geojsonExample = R"(
{ "type": "FeatureCollection",
"features": [
{ "type": "Feature",
"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
"properties": {"prop0": "value0"}
},
{ "type": "Feature",
"geometry": {
"type": "LineString",
"coordinates": [
[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
]
},
"properties": {
"prop0": "value0",
"prop1": 0.0
}
},
{ "type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})";
json::parser_callback_t cb = [&](int, json::parse_event_t event, json & parsed)
{
// skip uninteresting events
if (event == json::parse_event_t::value and !parsed.is_primitive())
{
return false;
}
switch (event)
{
case json::parse_event_t::key:
{
return true;
}
case json::parse_event_t::value:
{
return false;
}
case json::parse_event_t::object_start:
{
return true;
}
case json::parse_event_t::object_end:
{
return false;
}
case json::parse_event_t::array_start:
{
return true;
}
case json::parse_event_t::array_end:
{
return false;
}
default:
{
return true;
}
}
};
auto j = json::parse(geojsonExample, cb, true);
CHECK(j == json());
}
*/
}
SECTION
(
"constructing from contiguous containers"
)
...
...
test/src/unit-regression.cpp
View file @
99185230
...
...
@@ -1514,4 +1514,87 @@ TEST_CASE("regression tests")
CHECK
(
ff
.
x
==
3
);
nlohmann
::
json
nj
=
lj
;
// This line works as expected
}
SECTION
(
"issue #1001 - Fix memory leak during parser callback"
)
{
auto
geojsonExample
=
R"(
{ "type": "FeatureCollection",
"features": [
{ "type": "Feature",
"geometry": {"type": "Point", "coordinates": [102.0, 0.5]},
"properties": {"prop0": "value0"}
},
{ "type": "Feature",
"geometry": {
"type": "LineString",
"coordinates": [
[102.0, 0.0], [103.0, 1.0], [104.0, 0.0], [105.0, 1.0]
]
},
"properties": {
"prop0": "value0",
"prop1": 0.0
}
},
{ "type": "Feature",
"geometry": {
"type": "Polygon",
"coordinates": [
[ [100.0, 0.0], [101.0, 0.0], [101.0, 1.0],
[100.0, 1.0], [100.0, 0.0] ]
]
},
"properties": {
"prop0": "value0",
"prop1": {"this": "that"}
}
}
]
})"
;
json
::
parser_callback_t
cb
=
[
&
](
int
,
json
::
parse_event_t
event
,
json
&
parsed
)
{
// skip uninteresting events
if
(
event
==
json
::
parse_event_t
::
value
and
!
parsed
.
is_primitive
())
{
return
false
;
}
switch
(
event
)
{
case
json
:
:
parse_event_t
::
key
:
{
return
true
;
}
case
json
:
:
parse_event_t
::
value
:
{
return
false
;
}
case
json
:
:
parse_event_t
::
object_start
:
{
return
true
;
}
case
json
:
:
parse_event_t
::
object_end
:
{
return
false
;
}
case
json
:
:
parse_event_t
::
array_start
:
{
return
true
;
}
case
json
:
:
parse_event_t
::
array_end
:
{
return
false
;
}
default:
{
return
true
;
}
}
};
auto
j
=
json
::
parse
(
geojsonExample
,
cb
,
true
);
CHECK
(
j
==
json
());
}
}
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