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

jcea · jcea · commit 67bd81b8671e · 2012-09-10T22:58:35.000+02:00
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
@@ -1367,6 +1367,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
`@@ -1367,6 +1367,7 @@ new_mmap_object(PyTypeObject type, PyObject args, PyObject *kwdict)`
`1367`	`1367`	`if (size == 0) {`
`1368`	`1368`	`PyErr_SetString(PyExc_ValueError,`
`1369`	`1369`	`"cannot mmap an empty file");`
	`1370`	`+ Py_DECREF(m_obj);`
`1370`	`1371`	`return NULL;`
`1371`	`1372`	`}`
`1372`	`1373`	`if (offset >= size) {`