third_party/protobuf/src/google/protobuf/descriptor.pb.cc - Issue 10793026: Roll Protobuf r415:r423.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/protobuf/src/google/protobuf/descriptor.pb.cc

Issue 10793026: Roll Protobuf r415:r423. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: third_party/protobuf/src/google/protobuf/descriptor.pb.cc

diff --git a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

index 47595bbdcdecd1a16bed848e55e9304e62da02a7..7d16080ee98f2c13de584b4a46dffee5d0f51fe6 100644

--- a/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

+++ b/third_party/protobuf/src/google/protobuf/descriptor.pb.cc

@@ -1066,7 +1066,8 @@ bool FileDescriptorProto::MergePartialFromCodedStream(

DO_(::google::protobuf::internal::WireFormatLite::ReadString(

input, this->add_dependency()));

::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);

} else {

goto handle_uninterpreted;