diff options
| author |  xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
|---|---|---|
| committer | xiaofeng@google.com <xiaofeng@google.com@630680e5-0e50-0410-840e-4b1c322b438d> | 2012-09-22 02:40:50 +0000 |
| commit | b55a20fa2c669b181f47ea9219b8e74d1263da19 (patch) | |
| tree | 3936a0e7c22196587a6d8397372de41434fe2129 /src/google/protobuf/wire_format_lite.cc | |
| parent | 9ced30caf94bb4e7e9629c199679ff44e8ca7389 (diff) | |
Down-integrate from internal branch
Diffstat (limited to 'src/google/protobuf/wire_format_lite.cc')
| -rw-r--r-- | src/google/protobuf/wire_format_lite.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/google/protobuf/wire_format_lite.cc b/src/google/protobuf/wire_format_lite.cc index dbd29b47..738fc421 100644 --- a/src/google/protobuf/wire_format_lite.cc +++ b/src/google/protobuf/wire_format_lite.cc @@ -40,7 +40,7 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/io/coded_stream_inl.h> #include <google/protobuf/io/zero_copy_stream.h> -#include <google/protobuf/io/zero_copy_stream_impl.h> +#include <google/protobuf/io/zero_copy_stream_impl_lite.h> namespace google { namespace protobuf { @@ -281,12 +281,14 @@ void WireFormatLite::WriteString(int field_number, const string& value, io::CodedOutputStream* output) { // String is for UTF-8 text only WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output); + GOOGLE_CHECK(value.size() <= kint32max); output->WriteVarint32(value.size()); output->WriteString(value); } void WireFormatLite::WriteBytes(int field_number, const string& value, io::CodedOutputStream* output) { WriteTag(field_number, WIRETYPE_LENGTH_DELIMITED, output); + GOOGLE_CHECK(value.size() <= kint32max); output->WriteVarint32(value.size()); output->WriteString(value); } |