Merge pull request #4381 from radarhere/memory

Release buffer if function returns prematurely
This commit is contained in:
Hugo van Kemenade 2020-03-25 21:03:16 +02:00 committed by GitHub
commit 5e4b6e9378
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -354,17 +354,21 @@ PyImaging_MapBuffer(PyObject* self, PyObject* args)
if (view.len < 0) { if (view.len < 0) {
PyErr_SetString(PyExc_ValueError, "buffer has negative size"); PyErr_SetString(PyExc_ValueError, "buffer has negative size");
PyBuffer_Release(&view);
return NULL; return NULL;
} }
if (offset + size > view.len) { if (offset + size > view.len) {
PyErr_SetString(PyExc_ValueError, "buffer is not large enough"); PyErr_SetString(PyExc_ValueError, "buffer is not large enough");
PyBuffer_Release(&view);
return NULL; return NULL;
} }
im = ImagingNewPrologueSubtype( im = ImagingNewPrologueSubtype(
mode, xsize, ysize, sizeof(ImagingBufferInstance)); mode, xsize, ysize, sizeof(ImagingBufferInstance));
if (!im) if (!im) {
PyBuffer_Release(&view);
return NULL; return NULL;
}
/* setup file pointers */ /* setup file pointers */
if (ystep > 0) if (ystep > 0)