Use ReadVarint32 for Int32 types (protocolbuffers#8769)

* Add INT32 to list of 32-bit varint types * update descriptor protos Co-authored-by: Greg Stoll <[email protected]>
avm99963 · Sep 3, 2021 · 10d0fae · 10d0fae
1 parent a8b73fb
commit 10d0fae
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 26 deletions.
diff --git a/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc b/src/google/protobuf/compiler/cpp/cpp_parse_function_generator.cc
@@ -859,7 +859,8 @@ void ParseFunctionGenerator::GenerateFieldBody(
               field->number());
         }
       } else {
-        std::string size = (field->type() == FieldDescriptor::TYPE_SINT32 ||
+        std::string size = (field->type() == FieldDescriptor::TYPE_INT32  ||
+                            field->type() == FieldDescriptor::TYPE_SINT32 ||
                             field->type() == FieldDescriptor::TYPE_UINT32)
                                ? "32"
                                : "64";

diff --git a/src/google/protobuf/compiler/plugin.pb.cc b/src/google/protobuf/compiler/plugin.pb.cc
diff --git a/src/google/protobuf/descriptor.pb.cc b/src/google/protobuf/descriptor.pb.cc
diff --git a/src/google/protobuf/duration.pb.cc b/src/google/protobuf/duration.pb.cc
diff --git a/src/google/protobuf/timestamp.pb.cc b/src/google/protobuf/timestamp.pb.cc
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc
diff --git a/src/google/protobuf/wrappers.pb.cc b/src/google/protobuf/wrappers.pb.cc