Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix segment fault for proto3 optional #7805

Merged
merged 2 commits into from Aug 14, 2020
Merged

Fix segment fault for proto3 optional #7805

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
62af9ef
Fix segment fault for proto3 optional
anandolee Aug 14, 2020
ac6a066
Update generated_message_reflection.cc
anandolee Aug 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/google/protobuf/generated_message_reflection.cc
View file
Open in desktop
Expand Up @@ -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) {
Expand Down Expand Up @@ -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));
}
Expand Down