Skip to content
This repository was archived by the owner on Jan 28, 2022. It is now read-only.

Commit

Permalink
valijson downgrade to v4
Browse files Browse the repository at this point in the history
The valijson feature branch supporting json schema v6 and v7
<https://github.com/tristanpenman/valijson/tree/v6-and-v7-support>
causes a seg fault on Linux.
  • Loading branch information
zehnm committed Mar 13, 2020
1 parent 6f5b180 commit 2fcfe30
Show file tree
Hide file tree
Showing 11 changed files with 130 additions and 1,163 deletions.
6 changes: 2 additions & 4 deletions 3rdparty/valijson/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
This README has been copied from: <https://github.com/tristanpenman/valijson>

The sources used are from branch <https://github.com/tristanpenman/valijson/tree/v6-and-v7-support>.
Copied December 26, 2019.
This README and sources have been copied from the master branch of <https://github.com/tristanpenman/valijson>.
Copied March 13, 2020.

- only the include directory has been copied
- examples and testsuite were omitted
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ inline JsonCppObjectMemberIterator JsonCppObject::find(
{
if (value.isMember(propertyName)) {
Json::ValueConstIterator itr;
for (itr = value.begin(); itr != value.end(); ++itr) {
for ( itr = value.begin(); itr != value.end(); ++itr) {
if (itr.key() == propertyName) {
return itr;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -283,8 +283,9 @@ class PropertyTreeValue
array.emplace(tree); // Treat as empty array
} else {
bool isArray = true;
for (const auto node : tree) {
if (!node.first.empty()) {
boost::property_tree::ptree::const_iterator itr;
for (itr = tree.begin(); itr != tree.end(); itr++) {
if (!itr->first.empty()) {
isArray = false;
break;
}
Expand Down
Loading

0 comments on commit 2fcfe30

Please sign in to comment.