attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. #1446

scinart · 2019-01-19T01:39:04Z

attempt to fix #1445

serializer use fixed-size buffer. Whenever it is nearly full, it is flushed to output_adapter_t<char> o

But the code forgets to flush when there is an invalid utf8 code point

So there will be buffer overflow.

Pull request checklist

Read the Contribution Guidelines for detailed information.

Changes are described in the pull request, or an existing issue is referenced.
The test suite compiles and runs without error.
Code coverage is 100%. Test cases can be added by editing the test suite.
The source code is amalgamated; that is, after making changes to the sources in the include/nlohmann directory, run make amalgamate to create the single-header file single_include/nlohmann/json.hpp. The whole process is described here.

serializer use fixed buffer. Whenever it is nearly full, it is flushed to `output_adapter_t<char> o` But the code forgets to flush when there is a invalid utf8 code point So there will be buffer overflow.

coveralls · 2019-01-19T04:43:04Z

Coverage remained the same at 100.0% when pulling 20db020 on scinart:develop into dffae10 on nlohmann:develop.

test/src/unit-invalid_utf8.cpp

nlohmann

Looks good to me.

nlohmann · 2019-01-20T11:18:10Z

Thanks!

scinart added 2 commits January 18, 2019 20:35

flush buffer in serializer::dump_escaped case UTF8_REJECT

899bd94

serializer use fixed buffer. Whenever it is nearly full, it is flushed to `output_adapter_t<char> o` But the code forgets to flush when there is a invalid utf8 code point So there will be buffer overflow.

fix typo

83e8444

nlohmann requested changes Jan 19, 2019

View reviewed changes

test/src/unit-invalid_utf8.cpp Outdated Show resolved Hide resolved

move newly-added tests in unit-regression.cpp

20db020

nlohmann approved these changes Jan 19, 2019

View reviewed changes

nlohmann self-assigned this Jan 19, 2019

nlohmann added this to the Release 3.5.1 milestone Jan 19, 2019

nlohmann added the release item: 🐛 bug fix label Jan 19, 2019

nlohmann merged commit e17e0d0 into nlohmann:develop Jan 20, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. #1446

attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. #1446

scinart commented Jan 19, 2019

coveralls commented Jan 19, 2019 •

edited

Loading

nlohmann left a comment

nlohmann commented Jan 20, 2019

attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. #1446

attempt to fix #1445, flush buffer in serializer::dump_escaped in UTF8_REJECT case. #1446

Conversation

scinart commented Jan 19, 2019

Pull request checklist

coveralls commented Jan 19, 2019 • edited Loading

nlohmann left a comment

Choose a reason for hiding this comment

nlohmann commented Jan 20, 2019

coveralls commented Jan 19, 2019 •

edited

Loading