From 200bdbc2725d260071f39b9264b5f3270658d379 Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Sun, 16 Jul 2023 15:13:35 -0700 Subject: [PATCH] Internal change. PiperOrigin-RevId: 548534939 --- src/google/protobuf/extension_set.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/google/protobuf/extension_set.cc b/src/google/protobuf/extension_set.cc index 3581344946..cb8196159f 100644 --- a/src/google/protobuf/extension_set.cc +++ b/src/google/protobuf/extension_set.cc @@ -1466,8 +1466,8 @@ size_t ExtensionSet::Extension::ByteSize(int number) const { #undef HANDLE_TYPE case WireFormatLite::TYPE_MESSAGE: { if (is_lazy) { - size_t size = lazymessage_value->ByteSizeLong(); - result += io::CodedOutputStream::VarintSize32(size) + size; + // LazyField::ByteSizeLong includes sizeof(length). + result += lazymessage_value->ByteSizeLong(); } else { result += WireFormatLite::MessageSize(*message_value); } @@ -1931,16 +1931,12 @@ size_t ExtensionSet::Extension::MessageSetItemByteSize(int number) const { our_size += io::CodedOutputStream::VarintSize32(number); // message - size_t message_size = 0; if (is_lazy) { - message_size = lazymessage_value->ByteSizeLong(); + our_size += lazymessage_value->ByteSizeLong(); } else { - message_size = message_value->ByteSizeLong(); + our_size += WireFormatLite::MessageSize(*message_value); } - our_size += io::CodedOutputStream::VarintSize32(message_size); - our_size += message_size; - return our_size; }