Skip to content

Cherry-pick fix for empty map check crash to 29.x #20904

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

Merged
merged 1 commit into from
Apr 18, 2025
Merged

Cherry-pick fix for empty map check crash to 29.x #20904

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions python/google/protobuf/internal/well_known_types_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -683,6 +683,11 @@ def testDurationSub(self, old_time, time_delta, expected_sec, expected_nano):

class StructTest(unittest.TestCase):

def testEmptyDict(self):
# in operator for empty initialized struct
msg = well_known_types_test_pb2.WKTMessage(optional_struct={})
self.assertNotIn('key', msg.optional_struct)

def testStruct(self):
struct = struct_pb2.Struct()
self.assertIsInstance(struct, collections_abc.Mapping)
Expand Down
1 change: 1 addition & 0 deletions python/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1103,6 +1103,7 @@ static PyObject* PyUpb_Message_Contains(PyObject* _self, PyObject* arg) {
upb_Message* msg = PyUpb_Message_GetMsg(self);
const upb_FieldDef* f = upb_MessageDef_FindFieldByName(msgdef, "fields");
const upb_Map* map = upb_Message_GetFieldByDef(msg, f).map_val;
if (!map || upb_Map_Size(map) == 0) Py_RETURN_FALSE;
const upb_MessageDef* entry_m = upb_FieldDef_MessageSubDef(f);
const upb_FieldDef* key_f = upb_MessageDef_Field(entry_m, 0);
upb_MessageValue u_key;
Expand Down
Loading