]> git.ipfire.org Git - thirdparty/Python/cpython.git/commitdiff
gh-104698: Fix reference leak in mmapmodule.c (#104700)
authorKirill Podoprigora <kirill.bast9@mail.ru>
Sun, 21 May 2023 00:19:56 +0000 (03:19 +0300)
committerGitHub <noreply@github.com>
Sun, 21 May 2023 00:19:56 +0000 (01:19 +0100)
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
Modules/mmapmodule.c

index 8e5a0bde889901e3e694070e6c70ebc8ad752ee8..6bde9939eaa2ca11c7e3eb603d501743d76ddc32 100644 (file)
@@ -227,6 +227,14 @@ do {                                                                    \
     return err;                                                         \
     }                                                                   \
 } while (0)
+#define CHECK_VALID_OR_RELEASE(err, buffer)                             \
+do {                                                                    \
+    if (self->map_handle == NULL) {                                     \
+    PyErr_SetString(PyExc_ValueError, "mmap closed or invalid");        \
+    PyBuffer_Release(&(buffer));                                        \
+    return (err);                                                       \
+    }                                                                   \
+} while (0)
 #endif /* MS_WINDOWS */
 
 #ifdef UNIX
@@ -237,6 +245,14 @@ do {                                                                    \
     return err;                                                         \
     }                                                                   \
 } while (0)
+#define CHECK_VALID_OR_RELEASE(err, buffer)                             \
+do {                                                                    \
+    if (self->data == NULL) {                                           \
+    PyErr_SetString(PyExc_ValueError, "mmap closed or invalid");        \
+    PyBuffer_Release(&(buffer));                                        \
+    return (err);                                                       \
+    }                                                                   \
+} while (0)
 #endif /* UNIX */
 
 static PyObject *
@@ -326,7 +342,7 @@ mmap_gfind(mmap_object *self,
             end = self->size;
 
         Py_ssize_t res;
-        CHECK_VALID(NULL);
+        CHECK_VALID_OR_RELEASE(NULL, view);
         if (reverse) {
             res = _PyBytes_ReverseFind(
                 self->data + start, end - start,
@@ -403,7 +419,7 @@ mmap_write_method(mmap_object *self,
         return NULL;
     }
 
-    CHECK_VALID(NULL);
+    CHECK_VALID_OR_RELEASE(NULL, data);
     memcpy(&self->data[self->pos], data.buf, data.len);
     self->pos += data.len;
     PyBuffer_Release(&data);
@@ -1087,7 +1103,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
             return -1;
         }
 
-        CHECK_VALID(-1);
+        CHECK_VALID_OR_RELEASE(-1, vbuf);
         if (slicelen == 0) {
         }
         else if (step == 1) {