Use ImagingError_MemoryError NULL return value

python-pillow · Dec 20, 2020 · b7fb39f · b7fb39f
1 parent 75542fe
commit b7fb39f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/_imaging.c b/src/_imaging.c
@@ -2711,8 +2711,7 @@ _font_getmask(ImagingFontObject* self, PyObject* args)
     im = ImagingNew(self->bitmap->mode, textwidth(self, text), self->ysize);
     if (!im) {
         free(text);
-        ImagingError_MemoryError();
-        return NULL;
+        return ImagingError_MemoryError();
     }
 
     b = 0;
@@ -3933,8 +3932,7 @@ _set_blocks_max(PyObject* self, PyObject* args)
 
 
     if ( ! ImagingMemorySetBlocksMax(&ImagingDefaultArena, blocks_max)) {
-        ImagingError_MemoryError();
-        return NULL;
+        return ImagingError_MemoryError();
     }
 
     Py_INCREF(Py_None);

diff --git a/src/encode.c b/src/encode.c
@@ -1005,8 +1005,7 @@ static unsigned int* get_qtables_arrays(PyObject* qtables, int* qtablesLen) {
     qarrays = (unsigned int*) malloc(num_tables * DCTSIZE2 * sizeof(unsigned int));
     if (!qarrays) {
         Py_DECREF(tables);
-        ImagingError_MemoryError();
-        return NULL;
+        return ImagingError_MemoryError();
     }
     for (i = 0; i < num_tables; i++) {
         table = PySequence_Fast_GET_ITEM(tables, i);

diff --git a/src/path.c b/src/path.c
@@ -53,12 +53,10 @@ alloc_array(Py_ssize_t count)
 {
     double* xy;
     if (count < 0) {
-        ImagingError_MemoryError();
-        return NULL;
+        return ImagingError_MemoryError();
     }
     if ((unsigned long long)count > (SIZE_MAX / (2 * sizeof(double))) - 1 ) {
-        ImagingError_MemoryError();
-        return NULL;
+        return ImagingError_MemoryError();
     }
     xy = malloc(2 * count * sizeof(double) + 1);
     if (!xy) {