commit b915e9f44e9d979617d7738f7ddd7dd02ccd7c76
author Hood Chatham <roberthoodchatham@gmail.com> Sat Aug 31 05:23:22 2024 -0700
committer Copybara-Service <copybara-worker@google.com> Sat Aug 31 05:26:35 2024 -0700
tree d0570e4b827e61de8fc6e13dc82b7604078a7b90
parent 2f9e1504a2cae1bada7adacbe9bbcad966391437

Fix signature of `PyUpb_MessageMeta_Clear` (#17959)

A `tp_clear` function should have signature `int f(PyObject*)`. The presence of erroneous extra parameters leads to undefined behavior as indicated in the C specification 6.3.2.3.8. In WebAssembly builds, this causes crashes. https://www.open-std.org/jtc1/sc22/wg14/www/docs/n1256.pdf#page=60

Closes #17959

COPYBARA_INTEGRATE_REVIEW=https://github.com/protocolbuffers/protobuf/pull/17959 from hoodmane:fix-message-meta-clear-sig b618f806a9c9a7fec79caedb218c32991c2fbf98
PiperOrigin-RevId: 669639153

python/message.c

diff --git a/python/message.c b/python/message.c
index c81b43b..5ad1b06 100644
--- a/python/message.c
+++ b/python/message.c
@@ -2025,7 +2025,7 @@
   return cpython_bits.type_traverse(self, visit, arg);
 }
 
-static int PyUpb_MessageMeta_Clear(PyObject* self, visitproc visit, void* arg) {
+static int PyUpb_MessageMeta_Clear(PyObject* self) {
   PyUpb_MessageMeta* meta = PyUpb_GetMessageMeta(self);
   Py_CLEAR(meta->py_message_descriptor);
   return cpython_bits.type_clear(self);