third_party/protobuf/src/google/protobuf/stubs/substitute.cc - Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c)

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/stubs/substitute.cc

Issue 2495533002: third_party/protobuf: Update to HEAD (83d681ee2c) (Closed)

Patch Set: Make chrome settings proto generated file a component Created 4 years 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/stubs/substitute.cc

diff --git a/third_party/protobuf/src/google/protobuf/stubs/substitute.cc b/third_party/protobuf/src/google/protobuf/stubs/substitute.cc

index c9d95899f5249c8d25076898c4ceba419cc6cd49..7194a5b171e9ef00e4af06dccd025d833f00185f 100644

--- a/third_party/protobuf/src/google/protobuf/stubs/substitute.cc

+++ b/third_party/protobuf/src/google/protobuf/stubs/substitute.cc

@@ -113,7 +113,9 @@ void SubstituteAndAppend(

for (int i = 0; format[i] != '\0'; i++) {

if (format[i] == '$') {

if (ascii_isdigit(format[i+1])) {

- const SubstituteArg* src = args_array[format[i+1] - '0'];

+ unsigned int index = format[i+1] - '0';

+ assert(index < 10);

+ const SubstituteArg* src = args_array[index];

memcpy(target, src->data(), src->size());

target += src->size();

++i; // Skip next char.