amorfo77/json
1
0
Fork 0
mirror of https://github.com/nlohmann/json.git synced 2026-05-15 18:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed a bug for short input files (#344)

Browse Source 
For input files with less than 5 bytes, the parser had a bug so that
refilling the input buffer led to erasing it.
This commit is contained in:
Niels
2016-10-29 13:32:36 +02:00
parent 2fdba9de19
commit 42ea4fb751
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/json.hpp
+8 -4
View File
@@ -8598,11 +8598,15 @@ basic_json_parser_63:
// no stream is used or end of file is reached
if (m_stream == nullptr or m_stream->eof())
{
// copy unprocessed characters to line buffer
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
// skip this part if we are already using the line buffer
if (m_start != reinterpret_cast<const lexer_char_t*>(m_line_buffer.data()))
{
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
// copy unprocessed characters to line buffer
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
{
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
}
}
// append 5 characters (size of longest keyword "false") to
src/json.hpp.re2c
+8 -4
View File
@@ -7895,11 +7895,15 @@ class basic_json
// no stream is used or end of file is reached
if (m_stream == nullptr or m_stream->eof())
{
// copy unprocessed characters to line buffer
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
// skip this part if we are already using the line buffer
if (m_start != reinterpret_cast<const lexer_char_t*>(m_line_buffer.data()))
{
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
// copy unprocessed characters to line buffer
m_line_buffer.clear();
for (m_cursor = m_start; m_cursor != m_limit; ++m_cursor)
{
m_line_buffer.append(1, static_cast<const char>(*m_cursor));
}
}
// append 5 characters (size of longest keyword "false") to