Skip to content

J
json
Commit dcd3a6c6 by chenguoping
Options

move the catch of std::invalid_argument into array_index()

parent bfc003ca
Showing with 44 additions and 114 deletions
include/nlohmann/detail/json_pointer.hpp
...@@ -344,7 +344,15 @@ class json_pointer ...@@ -344,7 +344,15 @@ class json_pointer
} }
std::size_t processed_chars = 0; std::size_t processed_chars = 0;
const int res = std::stoi(s, &processed_chars); int res = 0;
JSON_TRY
{
res = std::stoi(s, &processed_chars);
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number"));
}
// check if the string was completely read // check if the string was completely read
if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size())) if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
...@@ -411,14 +419,7 @@ class json_pointer ...@@ -411,14 +419,7 @@ class json_pointer
case detail::value_t::array: case detail::value_t::array:
{ {
// create an entry in the array // create an entry in the array
JSON_TRY result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
{
result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -496,15 +497,8 @@ class json_pointer ...@@ -496,15 +497,8 @@ class json_pointer
else else
{ {
// convert array index to number; unchecked access // convert array index to number; unchecked access
JSON_TRY ptr = &ptr->operator[](
{ static_cast<size_type>(array_index(reference_token)));
ptr = &ptr->operator[](
static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
} }
break; break;
} }
...@@ -548,14 +542,7 @@ class json_pointer ...@@ -548,14 +542,7 @@ class json_pointer
} }
// note: at performs range check // note: at performs range check
JSON_TRY ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
{
ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -605,15 +592,8 @@ class json_pointer ...@@ -605,15 +592,8 @@ class json_pointer
} }
// use unchecked array access // use unchecked array access
JSON_TRY ptr = &ptr->operator[](
{ static_cast<size_type>(array_index(reference_token)));
ptr = &ptr->operator[](
static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -656,14 +636,7 @@ class json_pointer ...@@ -656,14 +636,7 @@ class json_pointer
} }
// note: at performs range check // note: at performs range check
JSON_TRY ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
{
ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -706,22 +679,14 @@ class json_pointer ...@@ -706,22 +679,14 @@ class json_pointer
return false; return false;
} }
JSON_TRY const auto idx = static_cast<size_type>(array_index(reference_token));
{ if (idx >= ptr->size())
const auto idx = static_cast<size_type>(array_index(reference_token));
if (idx >= ptr->size())
{
// index out of range
return false;
}
ptr = &ptr->operator[](idx);
break;
}
JSON_CATCH(std::invalid_argument&)
{ {
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number")); // index out of range
return false;
} }
ptr = &ptr->operator[](idx);
break; break;
} }
......
single_include/nlohmann/json.hpp
...@@ -10418,7 +10418,15 @@ class json_pointer ...@@ -10418,7 +10418,15 @@ class json_pointer
} }
std::size_t processed_chars = 0; std::size_t processed_chars = 0;
const int res = std::stoi(s, &processed_chars); int res = 0;
JSON_TRY
{
res = std::stoi(s, &processed_chars);
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + s + "' is not a number"));
}
// check if the string was completely read // check if the string was completely read
if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size())) if (JSON_HEDLEY_UNLIKELY(processed_chars != s.size()))
...@@ -10485,14 +10493,7 @@ class json_pointer ...@@ -10485,14 +10493,7 @@ class json_pointer
case detail::value_t::array: case detail::value_t::array:
{ {
// create an entry in the array // create an entry in the array
JSON_TRY result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
{
result = &result->operator[](static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -10570,15 +10571,8 @@ class json_pointer ...@@ -10570,15 +10571,8 @@ class json_pointer
else else
{ {
// convert array index to number; unchecked access // convert array index to number; unchecked access
JSON_TRY ptr = &ptr->operator[](
{ static_cast<size_type>(array_index(reference_token)));
ptr = &ptr->operator[](
static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
} }
break; break;
} }
...@@ -10622,14 +10616,7 @@ class json_pointer ...@@ -10622,14 +10616,7 @@ class json_pointer
} }
// note: at performs range check // note: at performs range check
JSON_TRY ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
{
ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -10679,15 +10666,8 @@ class json_pointer ...@@ -10679,15 +10666,8 @@ class json_pointer
} }
// use unchecked array access // use unchecked array access
JSON_TRY ptr = &ptr->operator[](
{ static_cast<size_type>(array_index(reference_token)));
ptr = &ptr->operator[](
static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -10730,14 +10710,7 @@ class json_pointer ...@@ -10730,14 +10710,7 @@ class json_pointer
} }
// note: at performs range check // note: at performs range check
JSON_TRY ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
{
ptr = &ptr->at(static_cast<size_type>(array_index(reference_token)));
}
JSON_CATCH(std::invalid_argument&)
{
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number"));
}
break; break;
} }
...@@ -10780,22 +10753,14 @@ class json_pointer ...@@ -10780,22 +10753,14 @@ class json_pointer
return false; return false;
} }
JSON_TRY const auto idx = static_cast<size_type>(array_index(reference_token));
{ if (idx >= ptr->size())
const auto idx = static_cast<size_type>(array_index(reference_token));
if (idx >= ptr->size())
{
// index out of range
return false;
}
ptr = &ptr->operator[](idx);
break;
}
JSON_CATCH(std::invalid_argument&)
{ {
JSON_THROW(detail::parse_error::create(109, 0, "array index '" + reference_token + "' is not a number")); // index out of range
return false;
} }
ptr = &ptr->operator[](idx);
break; break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment