mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

gh-111178: fix UBSan failures in Modules/_lzmamodule.c (GH-129783)

Browse source 
fix UBSan failures for LZMA objects

suppress unused return values
This commit is contained in:
Bénédikt Tran 2025-02-18 14:48:21 +01:00 • committed by GitHub
parent 97d0011e7e
commit 185ac5adaf
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Modules/_lzmamodule.c
View file

@ -126,6 +126,9 @@ typedef struct {
PyThread_type_lock lock; PyThread_type_lock lock;
} Decompressor; } Decompressor;
#define Compressor_CAST(op) ((Compressor *)(op))
#define Decompressor_CAST(op) ((Decompressor *)(op))
/* Helper functions. */ /* Helper functions. */
static int static int
@ -857,14 +860,15 @@ error:
} }
static void static void
Compressor_dealloc(Compressor *self) Compressor_dealloc(PyObject *op)
{ {
Compressor *self = Compressor_CAST(op);
lzma_end(&self->lzs); lzma_end(&self->lzs);
if (self->lock != NULL) { if (self->lock != NULL) {
PyThread_free_lock(self->lock); PyThread_free_lock(self->lock);
} }
PyTypeObject *tp = Py_TYPE(self); PyTypeObject *tp = Py_TYPE(self);
tp->tp_free((PyObject *)self); tp->tp_free(self);
Py_DECREF(tp); Py_DECREF(tp);
} }
@ -875,7 +879,7 @@ static PyMethodDef Compressor_methods[] = {
}; };
static int static int
Compressor_traverse(Compressor *self, visitproc visit, void *arg) Compressor_traverse(PyObject *self, visitproc visit, void *arg)
{ {
Py_VISIT(Py_TYPE(self)); Py_VISIT(Py_TYPE(self));
return 0; return 0;
@ -1304,8 +1308,9 @@ error:
} }
static void static void
Decompressor_dealloc(Decompressor *self) Decompressor_dealloc(PyObject *op)
{ {
Decompressor *self = Decompressor_CAST(op);
if(self->input_buffer != NULL) if(self->input_buffer != NULL)
PyMem_Free(self->input_buffer); PyMem_Free(self->input_buffer);
@ -1315,12 +1320,12 @@ Decompressor_dealloc(Decompressor *self)
PyThread_free_lock(self->lock); PyThread_free_lock(self->lock);
} }
PyTypeObject *tp = Py_TYPE(self); PyTypeObject *tp = Py_TYPE(self);
tp->tp_free((PyObject *)self); tp->tp_free(self);
Py_DECREF(tp); Py_DECREF(tp);
} }
static int static int
Decompressor_traverse(Decompressor *self, visitproc visit, void *arg) Decompressor_traverse(PyObject *self, visitproc visit, void *arg)
{ {
Py_VISIT(Py_TYPE(self)); Py_VISIT(Py_TYPE(self));
return 0; return 0;
@ -1633,7 +1638,7 @@ lzma_clear(PyObject *module)
static void static void
lzma_free(void *module) lzma_free(void *module)
{ {
lzma_clear((PyObject *)module); (void)lzma_clear((PyObject *)module);
} }
static PyModuleDef _lzmamodule = { static PyModuleDef _lzmamodule = {