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

Merge pull request #4068 from wsw2016/fix_4032

Browse Source 
resolved issue 4032 and added a unit test
This commit is contained in:
Adam Cozzette 2017-12-20 09:42:12 -08:00 committed by GitHub
commit 1e418e4e54
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 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

@ -50,7 +50,9 @@ namespace util {
namespace internal { namespace internal {
ZeroCopyStreamByteSink::~ZeroCopyStreamByteSink() { ZeroCopyStreamByteSink::~ZeroCopyStreamByteSink() {
if (buffer_size_ > 0) {
stream_->BackUp(buffer_size_); stream_->BackUp(buffer_size_);
}
} }
void ZeroCopyStreamByteSink::Append(const char* bytes, size_t len) { void ZeroCopyStreamByteSink::Append(const char* bytes, size_t len) {

24
src/google/protobuf/util/json_util_test.cc
View File

@ -40,6 +40,7 @@
#include <google/protobuf/util/json_format_proto3.pb.h> #include <google/protobuf/util/json_format_proto3.pb.h>
#include <google/protobuf/util/type_resolver.h> #include <google/protobuf/util/type_resolver.h>
#include <google/protobuf/util/type_resolver_util.h> #include <google/protobuf/util/type_resolver_util.h>
#include <google/protobuf/io/zero_copy_stream_impl.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
namespace google { namespace google {
@ -457,6 +458,29 @@ TEST(ZeroCopyStreamByteSinkTest, TestAllInputOutputPatterns) {
} }
} }
TEST_F(JsonUtilTest, TestWrongJsonInput) {
using namespace google::protobuf;
const char json[] = "{\"unknown_field\":\"some_value\"}";
io::ArrayInputStream input_stream(json, strlen(json));
char proto_buffer[10000];
io::ArrayOutputStream output_stream(proto_buffer, sizeof(proto_buffer));
std::string message_type = "type.googleapis.com/proto3.TestMessage";
TypeResolver* resolver = NewTypeResolverForDescriptorPool(
"type.googleapis.com",
DescriptorPool::generated_pool());
util::Status result_status = util::JsonToBinaryStream(resolver,
message_type,
&input_stream,
&output_stream);
delete resolver;
EXPECT_FALSE(result_status.ok());
EXPECT_EQ(result_status.error_code(),
google::protobuf::util::error::INVALID_ARGUMENT);
}
} // namespace } // namespace
} // namespace util } // namespace util
} // namespace protobuf } // namespace protobuf