commit 20f0ea1f610842c98bbfcf653f4414b88f767083
author Jesus Cea <jcea@jcea.es> Mon Sep 10 22:45:47 2012 +0200
committer Jesus Cea <jcea@jcea.es> Mon Sep 10 22:45:47 2012 +0200
tree 8296a1be6e25c682069ab19f52f5bfcfc9b2f70f
parent 3fb774ec5f64f0856767e5726d8083a5bf63f33e

#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 8cf0e87..62d934c 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -1388,6 +1388,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");