From 224c976c5afe046938a7c4e05f7ad52945d4a14b Mon Sep 17 00:00:00 2001 From: Anton Grbin Date: Thu, 18 Apr 2024 21:28:43 +0200 Subject: [PATCH 1/2] provide a correct field reference --- src/google/protobuf/json/internal/parser.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/google/protobuf/json/internal/parser.cc b/src/google/protobuf/json/internal/parser.cc index fbf492afa715..b828e81864c9 100644 --- a/src/google/protobuf/json/internal/parser.cc +++ b/src/google/protobuf/json/internal/parser.cc @@ -701,7 +701,7 @@ absl::Status ParseMap(JsonLexer& lex, Field field, Msg& msg) { } case FieldDescriptor::TYPE_ENUM: { MaybeOwnedString key_str = key.value; - auto e = ParseEnumFromStr(lex, key_str, field); + auto e = ParseEnumFromStr(lex, key_str, key_field); RETURN_IF_ERROR(e.status()); Traits::SetEnum(key_field, entry, e->value_or(0)); break; From 5368db18685013aefe2fe7993ac2c7f1d787788c Mon Sep 17 00:00:00 2001 From: Anton Grbin Date: Thu, 9 May 2024 22:16:34 +0200 Subject: [PATCH 2/2] remove unused enum block --- src/google/protobuf/json/internal/parser.cc | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/google/protobuf/json/internal/parser.cc b/src/google/protobuf/json/internal/parser.cc index b828e81864c9..ae4954d75e75 100644 --- a/src/google/protobuf/json/internal/parser.cc +++ b/src/google/protobuf/json/internal/parser.cc @@ -699,13 +699,6 @@ absl::Status ParseMap(JsonLexer& lex, Field field, Msg& msg) { } break; } - case FieldDescriptor::TYPE_ENUM: { - MaybeOwnedString key_str = key.value; - auto e = ParseEnumFromStr(lex, key_str, key_field); - RETURN_IF_ERROR(e.status()); - Traits::SetEnum(key_field, entry, e->value_or(0)); - break; - } case FieldDescriptor::TYPE_STRING: { Traits::SetString(key_field, entry, std::move(key.value.ToString()));