nerdcruft/libcruft-util
1
0
Fork 0
Code Issues Releases Activity

json/schema: check before using exclusiveMin/Max

Browse Source
This commit is contained in:
Danny Robson 2015-03-19 00:25:04 +11:00
parent dc8fd96e4b
commit 7c4604d0c7
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
json/schema.cpp
View File

@ -211,10 +211,12 @@ validate (json::tree::number &node,
// check maximum holds. exclusive requires max condition. // check maximum holds. exclusive requires max condition.
auto max = schema.find ("maximum"); auto max = schema.find ("maximum");
auto exclusiveMax = schema.find ("exclusiveMaximum"); auto exclusiveMax = schema.find ("exclusiveMaximum");
if (max != schema.cend ()) { if (max != schema.end ()) {
auto cmp = max->second->as_number ().native (); auto cmp = max->second->as_number ().native ();
if (exclusiveMax->second->as_boolean () ? (val <= cmp) : (val < cmp)) if (exclusiveMax != schema.end () && exclusiveMax->second->as_boolean () && val <= cmp)
return false;
else if (val < cmp)
return false; return false;
} else { } else {
if (exclusiveMax != schema.cend ()) if (exclusiveMax != schema.cend ())
@ -224,10 +226,12 @@ validate (json::tree::number &node,
// check minimum holds. exclusive requires min condition // check minimum holds. exclusive requires min condition
auto min = schema.find ("minimum"); auto min = schema.find ("minimum");
auto exclusiveMin = schema.find ("exclusiveMinimum"); auto exclusiveMin = schema.find ("exclusiveMinimum");
if (min != schema.cend ()) { if (min != schema.end ()) {
auto cmp = min->second->as_number ().native (); auto cmp = min->second->as_number ().native ();
if (exclusiveMin->second->as_boolean () ? val >= cmp : val > cmp) if (exclusiveMin != schema.end () && exclusiveMin->second->as_boolean () && val >= cmp)
return false;
else if (val > cmp)
return false; return false;
} else { } else {
if (exclusiveMin != schema.cend ()) if (exclusiveMin != schema.cend ())