Skip to content

Fix missing null dereference checks #9489

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
radarhere merged 5 commits into from
Mar 27, 2026
+42 −1
Merged

Fix missing null dereference checks #9489

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5945104
Fix missing null dereference checks
wiredfool Mar 24, 2026
477f457
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Mar 24, 2026
2fbaadc
Apply suggestions from code review
wiredfool Mar 26, 2026
e3627b7
imagePtr is not null here
wiredfool Mar 26, 2026
a694b84
Freeing the avif pixel memory on all exits from the function
wiredfool Mar 26, 2026
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
16 changes: 16 additions & 0 deletions src/_avif.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -708,15 +708,27 @@ _decoder_get_info(AvifDecoderObject *self) {

if (image->xmp.size) {
xmp = PyBytes_FromStringAndSize((const char *)image->xmp.data, image->xmp.size);
if (!xmp) {
return NULL;
}
}

if (image->exif.size) {
exif =
PyBytes_FromStringAndSize((const char *)image->exif.data, image->exif.size);
if (!exif) {
Py_XDECREF(xmp);
return NULL;
}
}

if (image->icc.size) {
icc = PyBytes_FromStringAndSize((const char *)image->icc.data, image->icc.size);
if (!icc) {
Py_XDECREF(xmp);
Py_XDECREF(exif);
return NULL;
}
}

ret = Py_BuildValue(
Expand Down Expand Up @@ -799,13 +811,17 @@ _decoder_get_frame(AvifDecoderObject *self, PyObject *args) {

if (rgb.height > PY_SSIZE_T_MAX / rgb.rowBytes) {
PyErr_SetString(PyExc_MemoryError, "Integer overflow in pixel size");
// UNDONE avifRGBImageFreePixels(&rgb); ??
Copy link
Copy Markdown
Member

@radarhere radarhere Mar 24, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you want to leave a GitHub comment explaining the uncertainty around this?

Copy link
Copy Markdown
Member Author

@wiredfool wiredfool Mar 25, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like it should be there, but I wasn’t sure and it was late.

return NULL;
}

size = rgb.rowBytes * rgb.height;

bytes = PyBytes_FromStringAndSize((char *)rgb.pixels, size);
avifRGBImageFreePixels(&rgb);
if (!bytes) {
return NULL;
}

ret = Py_BuildValue(
"SKKK",
Expand Down
6 changes: 6 additions & 0 deletions src/_imaging.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2469,6 +2469,9 @@ _split(ImagingObject *self) {
}

list = PyTuple_New(self->image->bands);
if (!list) {
return NULL;
}
for (i = 0; i < self->image->bands; i++) {
imaging_object = PyImagingNew(bands[i]);
if (!imaging_object) {
Expand Down Expand Up @@ -3765,6 +3768,9 @@ _ptr_destructor(PyObject *capsule) {
static PyObject *
_getattr_ptr(ImagingObject *self, void *closure) {
PyObject *capsule = PyCapsule_New(self->image, IMAGING_MAGIC, _ptr_destructor);
if (!capsule) {
return NULL;
}
Py_INCREF(self);
PyCapsule_SetContext(capsule, self);
return capsule;
Expand Down
4 changes: 4 additions & 0 deletions src/_imagingft.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,6 +941,10 @@ font_render(FontObject *self, PyObject *args) {
return NULL;
}
PyObject *imagePtr = PyObject_GetAttrString(image, "ptr");
if (!imagePtr) {
PyMem_Del(glyph_info);
Comment thread
wiredfool marked this conversation as resolved.
return NULL;
}
im = (Imaging)PyCapsule_GetPointer(imagePtr, IMAGING_MAGIC);
Py_XDECREF(imagePtr);

Expand Down
11 changes: 11 additions & 0 deletions src/_imagingmorph.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,9 @@ match(PyObject *self, PyObject *args) {
}

imgin = (Imaging)PyCapsule_GetPointer(i0, IMAGING_MAGIC);
if (!imgin) {
return NULL;
}

if (imgin->type != IMAGING_TYPE_UINT8 || imgin->bands != 1) {
PyErr_SetString(PyExc_RuntimeError, "Unsupported image type");
Expand Down Expand Up @@ -185,6 +188,10 @@ match(PyObject *self, PyObject *args) {
(b6 << 6) | (b7 << 7) | (b8 << 8));
if (lut[lut_idx]) {
PyObject *coordObj = Py_BuildValue("(nn)", col_idx, row_idx);
if (!coordObj) {
Py_XDECREF(ret);
Comment thread
wiredfool marked this conversation as resolved.
Outdated
return NULL;
}
PyList_Append(ret, coordObj);
Py_XDECREF(coordObj);
}
Expand Down Expand Up @@ -230,6 +237,10 @@ get_on_pixels(PyObject *self, PyObject *args) {
for (col_idx = 0; col_idx < width; col_idx++) {
if (row[col_idx]) {
PyObject *coordObj = Py_BuildValue("(nn)", col_idx, row_idx);
if (!coordObj) {
Py_XDECREF(ret);
Comment thread
wiredfool marked this conversation as resolved.
Outdated
return NULL;
}
PyList_Append(ret, coordObj);
Py_XDECREF(coordObj);
}
Expand Down
3 changes: 3 additions & 0 deletions src/_webp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,6 +503,9 @@ _anim_decoder_get_next(PyObject *self) {
bytes = PyBytes_FromStringAndSize(
(char *)buf, decp->info.canvas_width * 4 * decp->info.canvas_height
);
if (!bytes) {
return NULL;
}

ret = Py_BuildValue("Si", bytes, timestamp);

Expand Down
Loading