#15676: mmap: add empty file check prior to offset check <- Previous patch was incomplete (fix 2)

jcea · jcea · commit e8db356cf108 · 2012-09-10T22:58:07.000+02:00
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -1345,6 +1345,7 @@ new_mmap_object(PyTypeObject *type, PyObject *args, PyObject *kwdict)
             if (size == 0) {
                 PyErr_SetString(PyExc_ValueError,
                                 "cannot mmap an empty file");
+                Py_DECREF(m_obj);
                 return NULL;
             }
             if (offset >= size) {

Original file line number	Diff line number	Diff line change
`@@ -1345,6 +1345,7 @@ new_mmap_object(PyTypeObject type, PyObject args, PyObject *kwdict)`
`1345`	`1345`	`if (size == 0) {`
`1346`	`1346`	`PyErr_SetString(PyExc_ValueError,`
`1347`	`1347`	`"cannot mmap an empty file");`
	`1348`	`+ Py_DECREF(m_obj);`
`1348`	`1349`	`return NULL;`
`1349`	`1350`	`}`
`1350`	`1351`	`if (offset >= size) {`