External/json
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix iterator_input_adapter consuming input before it should

Browse Source
This commit is contained in:
Luca 2022-04-14 13:00:52 +02:00
parent a94430615d
commit 358970e3d0
2 changed files with 46 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
include/nlohmann/detail/input/input_adapters.hpp
View File

@ -123,6 +123,7 @@ class input_stream_adapter
}; };
#endif // JSON_NO_IO #endif // JSON_NO_IO
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as
// theoretically possible for some containers, but it is extremely versatile. // theoretically possible for some containers, but it is extremely versatile.
template<typename IteratorType> template<typename IteratorType>
@ -132,30 +133,46 @@ class iterator_input_adapter
using char_type = typename std::iterator_traits<IteratorType>::value_type; using char_type = typename std::iterator_traits<IteratorType>::value_type;
iterator_input_adapter(IteratorType first, IteratorType last) iterator_input_adapter(IteratorType first, IteratorType last)
: current(std::move(first)), end(std::move(last)) : current(std::move(first)), end(std::move(last)), current_has_been_consumed(false)
{} {}
typename std::char_traits<char_type>::int_type get_character() typename std::char_traits<char_type>::int_type get_character()
{ {
if (JSON_HEDLEY_LIKELY(current != end))
if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{ {
auto result = std::char_traits<char_type>::to_int_type(*current);
std::advance(current, 1); std::advance(current, 1);
return result;
} }
return std::char_traits<char_type>::eof(); if (JSON_HEDLEY_LIKELY(current != end))
{
current_has_been_consumed = true;
return std::char_traits<char_type>::to_int_type(*current);
}
else
{
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
}
} }
private: private:
IteratorType current; IteratorType current;
IteratorType end; IteratorType end;
bool current_has_been_consumed = false;
template<typename BaseInputAdapter, size_t T> template<typename BaseInputAdapter, size_t T>
friend struct wide_string_input_helper; friend struct wide_string_input_helper;
bool empty() const bool empty()
{ {
if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{
std::advance(current, 1);
current_has_been_consumed = false;
}
return current == end; return current == end;
} }
}; };

29
single_include/nlohmann/json.hpp
View File

@ -5533,6 +5533,7 @@ class input_stream_adapter
}; };
#endif // JSON_NO_IO #endif // JSON_NO_IO
// General-purpose iterator-based adapter. It might not be as fast as // General-purpose iterator-based adapter. It might not be as fast as
// theoretically possible for some containers, but it is extremely versatile. // theoretically possible for some containers, but it is extremely versatile.
template<typename IteratorType> template<typename IteratorType>
@ -5542,30 +5543,46 @@ class iterator_input_adapter
using char_type = typename std::iterator_traits<IteratorType>::value_type; using char_type = typename std::iterator_traits<IteratorType>::value_type;
iterator_input_adapter(IteratorType first, IteratorType last) iterator_input_adapter(IteratorType first, IteratorType last)
: current(std::move(first)), end(std::move(last)) : current(std::move(first)), end(std::move(last)), current_has_been_consumed(false)
{} {}
typename std::char_traits<char_type>::int_type get_character() typename std::char_traits<char_type>::int_type get_character()
{ {
if (JSON_HEDLEY_LIKELY(current != end))
if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{ {
auto result = std::char_traits<char_type>::to_int_type(*current);
std::advance(current, 1); std::advance(current, 1);
return result;
} }
return std::char_traits<char_type>::eof(); if (JSON_HEDLEY_LIKELY(current != end))
{
current_has_been_consumed = true;
return std::char_traits<char_type>::to_int_type(*current);
}
else
{
current_has_been_consumed = false;
return std::char_traits<char_type>::eof();
}
} }
private: private:
IteratorType current; IteratorType current;
IteratorType end; IteratorType end;
bool current_has_been_consumed = false;
template<typename BaseInputAdapter, size_t T> template<typename BaseInputAdapter, size_t T>
friend struct wide_string_input_helper; friend struct wide_string_input_helper;
bool empty() const bool empty()
{ {
if (JSON_HEDLEY_LIKELY(current_has_been_consumed))
{
std::advance(current, 1);
current_has_been_consumed = false;
}
return current == end; return current == end;
} }
}; };