AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

JSON string output funtions should clear() the destination first

Browse Source 
Make the JSON util string output functions match the Message::SerializeToString() behavior.  This is helpful when packing the output into string fields of reused protobuf messages.
This commit is contained in:
boscosiu 2019-05-31 16:01:05 -07:00 committed by Adam Cozzette
parent 6153f80876
commit 3cbe45a4b5
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/google/protobuf/util/json_util.cc
View File

@ -115,6 +115,7 @@ util::Status BinaryToJsonString(TypeResolver* resolver,
const std::string& binary_input,
std::string* json_output,
const JsonPrintOptions& options) {
json_output->clear();
io::ArrayInputStream input_stream(binary_input.data(), binary_input.size());
io::StringOutputStream output_stream(json_output);
return BinaryToJsonStream(resolver, type_url, &input_stream, &output_stream,
@ -209,6 +210,7 @@ util::Status JsonToBinaryString(TypeResolver* resolver,
StringPiece json_input,
std::string* binary_output,
const JsonParseOptions& options) {
binary_output->clear();
io::ArrayInputStream input_stream(json_input.data(), json_input.size());
io::StringOutputStream output_stream(binary_output);
return JsonToBinaryStream(resolver, type_url, &input_stream, &output_stream,