https://github.com/python/cpython/commit/1c9b0204796ddeaee710646871a4404b4cda1f1b
commit: 1c9b0204796ddeaee710646871a4404b4cda1f1b
branch: main
author: Bénédikt Tran <[email protected]>
committer: encukou <[email protected]>
date: 2025-01-03T15:36:41+01:00
summary:
gh-111178: fix UBSan failures in `Modules/zlibmodule.c` (GH-128252)
files:
M Modules/zlibmodule.c
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 78dcce73cdaade..b90665ae7ef64a 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -221,6 +221,8 @@ typedef struct
PyThread_type_lock lock;
} compobject;
+#define _compobject_CAST(op) ((compobject *)op)
+
static void
zlib_error(zlibstate *state, z_stream zst, int err, const char *msg)
{
@@ -706,7 +708,7 @@ zlib_decompressobj_impl(PyObject *module, int wbits,
PyObject *zdict)
static void
Dealloc(compobject *self)
{
- PyObject *type = (PyObject *)Py_TYPE(self);
+ PyTypeObject *type = Py_TYPE(self);
PyThread_free_lock(self->lock);
Py_XDECREF(self->unused_data);
Py_XDECREF(self->unconsumed_tail);
@@ -716,18 +718,20 @@ Dealloc(compobject *self)
}
static void
-Comp_dealloc(compobject *self)
+Comp_dealloc(PyObject *op)
{
+ compobject *self = _compobject_CAST(op);
if (self->is_initialised)
- deflateEnd(&self->zst);
+ (void)deflateEnd(&self->zst);
Dealloc(self);
}
static void
-Decomp_dealloc(compobject *self)
+Decomp_dealloc(PyObject *op)
{
+ compobject *self = _compobject_CAST(op);
if (self->is_initialised)
- inflateEnd(&self->zst);
+ (void)inflateEnd(&self->zst);
Dealloc(self);
}
_______________________________________________
Python-checkins mailing list -- [email protected]
To unsubscribe send an email to [email protected]
https://mail.python.org/mailman3/lists/python-checkins.python.org/
Member address: [email protected]
