Fix unreachable code return in a case label that has a switch with on…

…ly a default case in it, which returns already (protocolbuffers#8927)
avm99963 · Sep 1, 2021 · 7b9b7fe · 7b9b7fe
1 parent 4368383
commit 7b9b7fe
Showing 1 changed file with 5 additions and 11 deletions.
diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
@@ -2491,18 +2491,12 @@ bool Reflection::HasBit(const Message& message,
     // (which uses HasField()) needs to be consistent with this.
     switch (field->cpp_type()) {
       case FieldDescriptor::CPPTYPE_STRING:
-        switch (field->options().ctype()) {
-          default: {
-            if (IsInlined(field)) {
-              return !GetField<InlinedStringField>(message, field)
-                          .GetNoArena()
-                          .empty();
-            }
-
-            return GetField<ArenaStringPtr>(message, field).Get().size() > 0;
-          }
+        if (IsInlined(field)) {
+          return !GetField<InlinedStringField>(message, field)
+                      .GetNoArena()
+                      .empty();
         }
-        return false;
+        return GetField<ArenaStringPtr>(message, field).Get().size() > 0;
       case FieldDescriptor::CPPTYPE_BOOL:
         return GetRaw<bool>(message, field) != false;
       case FieldDescriptor::CPPTYPE_INT32: