Skip to content

Fixed a SEGV when deep copying a non-reified sub-message. #17704

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
zhangskz merged 1 commit into from
Aug 5, 2024
Merged

Fixed a SEGV when deep copying a non-reified sub-message. #17704

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/reflection_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,6 +789,11 @@ def testDeepCopy(self, message_module):
messages.remove(messages[0])
self.assertEqual(len(messages), 0)

def testEmptyDeepCopy(self, message_module):
proto1 = message_module.TestAllTypes()
nested2 = copy.deepcopy(proto1.optional_nested_message)
self.assertEqual(0, nested2.bb)

# TODO: Implement deepcopy for extension dict

def testDisconnectingBeforeClear(self, message_module):
Expand Down
9 changes: 6 additions & 3 deletions python/message.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1610,10 +1610,13 @@ static PyObject* PyUpb_Message_WhichOneof(PyObject* _self, PyObject* name) {
PyObject* DeepCopy(PyObject* _self, PyObject* arg) {
PyUpb_Message* self = (void*)_self;
const upb_MessageDef* def = PyUpb_Message_GetMsgdef(_self);

const upb_MiniTable* mini_table = upb_MessageDef_MiniTable(def);
upb_Message* msg = PyUpb_Message_GetIfReified(_self);
PyObject* arena = PyUpb_Arena_New();
upb_Message* clone = upb_Message_DeepClone(
self->ptr.msg, upb_MessageDef_MiniTable(def), PyUpb_Arena_Get(arena));
upb_Arena* upb_arena = PyUpb_Arena_Get(arena);

upb_Message* clone = msg ? upb_Message_DeepClone(msg, mini_table, upb_arena)
: upb_Message_New(mini_table, upb_arena);
PyObject* ret = PyUpb_Message_Get(clone, def, arena);
Py_DECREF(arena);

Expand Down