Skip to content

gh-104698: Fix reference leak in mmapmodule.c#104700

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
pablogsal merged 5 commits into from
May 21, 2023
Merged

gh-104698: Fix reference leak in mmapmodule.c #104700

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f973151
gh-104698: Fix reference leak in mmapmodule.c
Eclips4 May 20, 2023
42a4cb1
Rename macro
Eclips4 May 20, 2023
a4341c7
Adjust slash position in macro definition
Eclips4 May 20, 2023
1162ef0
Update Modules/mmapmodule.c
JelleZijlstra May 20, 2023
80cd032
Update Modules/mmapmodule.c
JelleZijlstra May 20, 2023
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
22 changes: 19 additions & 3 deletions Modules/mmapmodule.c
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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
Expand All@@ -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 *
Expand DownExpand Up@@ -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,
Expand DownExpand Up@@ -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);
Expand DownExpand Up@@ -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){
Expand Down