Pass the complete text of a UBJSON/BJData high-precision number to SAX
For a high-precision number that is a floating-point number, the UBJSON/BJData reader passed lexer::get_token_string() as the source text to SAX number_float(). That helper is meant for error messages and shows a token of more than 8192 characters only by its first and last 4096 characters around "...", so a SAX handler received a shortened string for a long number. Pass the number text the lexer collected while scanning the number (lexer::get_string()) instead. It is complete and, as before, holds only the number, without any whitespace or byte order mark around it in the payload. Error messages still use get_token_string(). Signed-off-by: Niels Lohmann <mail@nlohmann.me>
This commit is contained in:
4 files changed
+48
-8
No files matched your search
@@ -1278,6 +1278,25 @@ TEST_CASE("BJData")
|
||||
CHECK(j.dump() == "3.141592653589793");
|
||||
}
|
||||
|
||||
SECTION("long floating-point number")
|
||||
{
|
||||
// the SAX parser receives the number text as it is in the
|
||||
// input, also when it is longer than the part of a token
|
||||
// that error messages show
|
||||
const std::vector<std::size_t> lengths = {8192, 8193, 10000};
|
||||
for (const auto length : lengths)
|
||||
{
|
||||
CAPTURE(length)
|
||||
const std::string number = "1." + std::string(length - 2, '3');
|
||||
std::vector<std::uint8_t> vec = {'H', 'I', static_cast<std::uint8_t>(length & 0xFF), static_cast<std::uint8_t>(length >> 8)};
|
||||
vec.insert(vec.end(), number.begin(), number.end());
|
||||
SaxEventLogger logger;
|
||||
CHECK(json::sax_parse(vec, &logger, json::input_format_t::bjdata));
|
||||
CHECK(logger.events == std::vector<std::string>({"number_float(" + number + ")"}));
|
||||
CHECK(json::from_bjdata(vec).is_number_float());
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("errors")
|
||||
{
|
||||
// error while parsing length
|
||||
|
||||
@@ -793,6 +793,25 @@ TEST_CASE("UBJSON")
|
||||
CHECK(j.dump() == "3.141592653589793");
|
||||
}
|
||||
|
||||
SECTION("long floating-point number")
|
||||
{
|
||||
// the SAX parser receives the number text as it is in the
|
||||
// input, also when it is longer than the part of a token
|
||||
// that error messages show
|
||||
const std::vector<std::size_t> lengths = {8192, 8193, 10000};
|
||||
for (const auto length : lengths)
|
||||
{
|
||||
CAPTURE(length)
|
||||
const std::string number = "1." + std::string(length - 2, '3');
|
||||
std::vector<std::uint8_t> vec = {'H', 'I', static_cast<std::uint8_t>(length >> 8), static_cast<std::uint8_t>(length & 0xFF)};
|
||||
vec.insert(vec.end(), number.begin(), number.end());
|
||||
SaxEventLogger logger;
|
||||
CHECK(json::sax_parse(vec, &logger, json::input_format_t::ubjson));
|
||||
CHECK(logger.events == std::vector<std::string>({"number_float(" + number + ")"}));
|
||||
CHECK(json::from_ubjson(vec).is_number_float());
|
||||
}
|
||||
}
|
||||
|
||||
SECTION("errors")
|
||||
{
|
||||
// error while parsing length
|
||||
|
||||
Reference in new issue
Block a user