commit 07105350894bf9376129f11e0d5f879e4c6ce9cf
author Jie Luo <jieluo@google.com> Fri Aug 14 11:20:37 2020 -0700
committer Adam Cozzette <acozzette@google.com> Fri Aug 14 12:57:13 2020 -0700
tree ff3f910ec1c50ec2841d207224f115af6f539074
parent 2ad43bfd3d5bfd09fd9fa6b8448138495daef219

Fix segment fault for proto3 optional (#7805)

* Fix segment fault for proto3 optional

 Fixes #7801

src/google/protobuf/generated_message_reflection.cc

diff --git a/src/google/protobuf/generated_message_reflection.cc b/src/google/protobuf/generated_message_reflection.cc
index 5483eda..9fb62b9 100644
--- a/src/google/protobuf/generated_message_reflection.cc
+++ b/src/google/protobuf/generated_message_reflection.cc
@@ -854,7 +854,7 @@
         }
 
         case FieldDescriptor::CPPTYPE_MESSAGE:
-          if (!schema_.HasHasbits()) {
+          if (schema_.HasBitIndex(field) == -1) {
             // Proto3 does not have has-bits and we need to set a message field
             // to nullptr in order to indicate its un-presence.
             if (GetArena(message) == nullptr) {
@@ -2048,6 +2048,7 @@
     return;
   }
   const uint32 index = schema_.HasBitIndex(field);
+  if (index == -1) return;
   MutableHasBits(message)[index / 32] &=
       ~(static_cast<uint32>(1) << (index % 32));
 }