Fix segment fault for proto3 optional (#7805)

* Fix segment fault for proto3 optional

 Fixes #7801
pull/7814/head
Jie Luo 5 years ago committed by GitHub
parent 389bd06d0a
commit 8a71927d74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      src/google/protobuf/generated_message_reflection.cc

@ -854,7 +854,7 @@ void Reflection::ClearField(Message* message,
}
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 @@ void Reflection::ClearBit(Message* message,
return;
}
const uint32 index = schema_.HasBitIndex(field);
if (index == -1) return;
MutableHasBits(message)[index / 32] &=
~(static_cast<uint32>(1) << (index % 32));
}

Loading…
Cancel
Save