commit 1f2799bef45673419e96ad4ef6a923c59d1c6a85
author Jesus Cea <jcea@jcea.es> Mon Sep 10 22:49:50 2012 +0200
committer Jesus Cea <jcea@jcea.es> Mon Sep 10 22:49:50 2012 +0200
tree f69d47f2609cb35b8e38c6e0e557ac432ced6c0f
parent 3159cb51a77da430272bfaf42c768493c72b456a

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

Modules/mmapmodule.c

diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index e23613e..b993fdf 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1342,6 +1342,11 @@
             }
 
             size = (((PY_LONG_LONG) high) << 32) + low;
+            if (size == 0) {
+                PyErr_SetString(PyExc_ValueError,
+                                "cannot mmap an empty file");
+                return NULL;
+            }
             if (offset >= size) {
                 PyErr_SetString(PyExc_ValueError,
                                 "mmap offset is greater than file size");