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

Fix issue 378

Browse Source
This commit is contained in:
xiaofeng@google.com 2012-05-16 05:41:31 +00:00
parent a269a2c48b
commit 2072421124
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/google/protobuf/compiler/cpp/cpp_string_field.cc
View File

@ -398,7 +398,8 @@ GenerateMergeFromCodedStream(io::Printer* printer) const {
descriptor_->type() == FieldDescriptor::TYPE_STRING) { descriptor_->type() == FieldDescriptor::TYPE_STRING) {
printer->Print(variables_, printer->Print(variables_,
"::google::protobuf::internal::WireFormat::VerifyUTF8String(\n" "::google::protobuf::internal::WireFormat::VerifyUTF8String(\n"
" this->$name$(0).data(), this->$name$(0).length(),\n" " this->$name$(this->$name$_size() - 1).data(),\n"
" this->$name$(this->$name$_size() - 1).length(),\n"
" ::google::protobuf::internal::WireFormat::PARSE);\n"); " ::google::protobuf::internal::WireFormat::PARSE);\n");
} }
} }

3
src/google/protobuf/compiler/plugin.pb.cc
View File

@ -243,7 +243,8 @@ bool CodeGeneratorRequest::MergePartialFromCodedStream(
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_file_to_generate())); input, this->add_file_to_generate()));
::google::protobuf::internal::WireFormat::VerifyUTF8String( ::google::protobuf::internal::WireFormat::VerifyUTF8String(
this->file_to_generate(0).data(), this->file_to_generate(0).length(), this->file_to_generate(this->file_to_generate_size() - 1).data(),
this->file_to_generate(this->file_to_generate_size() - 1).length(),
::google::protobuf::internal::WireFormat::PARSE); ::google::protobuf::internal::WireFormat::PARSE);
} else { } else {
goto handle_uninterpreted; goto handle_uninterpreted;

3
src/google/protobuf/descriptor.pb.cc
View File

@ -1065,7 +1065,8 @@ bool FileDescriptorProto::MergePartialFromCodedStream(
DO_(::google::protobuf::internal::WireFormatLite::ReadString( DO_(::google::protobuf::internal::WireFormatLite::ReadString(
input, this->add_dependency())); input, this->add_dependency()));
::google::protobuf::internal::WireFormat::VerifyUTF8String( ::google::protobuf::internal::WireFormat::VerifyUTF8String(
this->dependency(0).data(), this->dependency(0).length(), this->dependency(this->dependency_size() - 1).data(),
this->dependency(this->dependency_size() - 1).length(),
::google::protobuf::internal::WireFormat::PARSE); ::google::protobuf::internal::WireFormat::PARSE);
} else { } else {
goto handle_uninterpreted; goto handle_uninterpreted;