generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2025-01-31 14:39:53 +01:00
Code Issues Projects Releases Wiki Activity

Move JSON Pointer leading slash check out of recursive function

Browse Source
This commit is contained in:
Tristan Penman 2015-05-06 07:02:27 +10:00
parent 454ec19914
commit feaea37aee
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/valijson/internal/json_reference.hpp
View File

@ -33,15 +33,6 @@ inline AdapterType resolveJsonPointer(
const std::string::const_iterator jsonPointerEnd = jsonPointer.end();
// Check for leading forward slash
if (std::find(jsonPointerItr, jsonPointerEnd, '/') == jsonPointerEnd) {
throw std::runtime_error(
"Expected '/' while parsing JSON Pointer.");
}
// Proceed past leading slash
jsonPointerItr++;
// Recursion bottoms out here
if (jsonPointerItr == jsonPointerEnd) {
return node;
@ -149,7 +140,12 @@ inline AdapterType resolveJsonPointer(
const AdapterType &rootNode,
const std::string &jsonPointer)
{
return ::resolveJsonPointer(rootNode, jsonPointer, jsonPointer.begin());
if (jsonPointer.find("/") != 0) {
throw std::runtime_error(
"Expected leading '/' while parsing JSON Pointer.");
}
return ::resolveJsonPointer(rootNode, jsonPointer, jsonPointer.begin() + 1);
}
} // namespace json_reference