mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-03 05:35:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[3.11] gh-104698: Fix reference leak in mmapmodule.c (GH-104700) (#104710)

Browse source 
(cherry picked from commit 99b641886a)

Co-authored-by: Kirill Podoprigora <kirill.bast9@mail.ru>
Co-authored-by: Jelle Zijlstra <jelle.zijlstra@gmail.com>
This commit is contained in:
Miss Islington (bot) 2023-05-20 18:43:18 -07:00 • committed by GitHub
parent 2e457bc202
commit b2e0201222
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Modules/mmapmodule.c
View file

@ -235,6 +235,14 @@ do { \
return err; \ return err; \
} \ } \
} while (0) } 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 */ #endif /* MS_WINDOWS */
#ifdef UNIX #ifdef UNIX
@ -245,6 +253,14 @@ do { \
return err; \ return err; \
} \ } \
} while (0) } 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 */ #endif /* UNIX */
static PyObject * static PyObject *
@ -334,7 +350,7 @@ mmap_gfind(mmap_object *self,
end = self->size; end = self->size;
Py_ssize_t res; Py_ssize_t res;
CHECK_VALID(NULL); CHECK_VALID_OR_RELEASE(NULL, view);
if (reverse) { if (reverse) {
res = _PyBytes_ReverseFind( res = _PyBytes_ReverseFind(
self->data + start, end - start, self->data + start, end - start,
@ -411,7 +427,7 @@ mmap_write_method(mmap_object *self,
return NULL; return NULL;
} }
CHECK_VALID(NULL); CHECK_VALID_OR_RELEASE(NULL, data);
memcpy(&self->data[self->pos], data.buf, data.len); memcpy(&self->data[self->pos], data.buf, data.len);
self->pos += data.len; self->pos += data.len;
PyBuffer_Release(&data); PyBuffer_Release(&data);
@ -1097,7 +1113,7 @@ mmap_ass_subscript(mmap_object *self, PyObject *item, PyObject *value)
return -1; return -1;
} }
CHECK_VALID(-1); CHECK_VALID_OR_RELEASE(-1, vbuf);
if (slicelen == 0) { if (slicelen == 0) {
} }
else if (step == 1) { else if (step == 1) {