AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Fix segment fault for proto3 optional (#7805)

Browse Source 
* Fix segment fault for proto3 optional

 Fixes #7801
This commit is contained in:
Jie Luo 2020-08-14 11:20:37 -07:00 committed by Adam Cozzette
parent 2ad43bfd3d
commit 0710535089
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/google/protobuf/generated_message_reflection.cc
View File

@ -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));
}