Patch mmap.diff.txt for Reproducible crash Bug #48034

Patch version 2012-01-16 14:43 UTC

• 2012-01-16 14:43 UTC [diff to current]

Developer: dmitry@zend.com

Index: main/main.c
===================================================================
--- main/main.c	(revision 322017)
+++ main/main.c	(working copy)
@@ -92,7 +92,7 @@
 #include "SAPI.h"
 #include "rfc1867.h"
 
-#if HAVE_MMAP
+#if HAVE_MMAP || defined(PHP_WIN32)
 # if HAVE_UNISTD_H
 #  include <unistd.h>
 #  if defined(_SC_PAGESIZE)
@@ -1216,7 +1216,7 @@
 	php_stream *stream = php_stream_open_wrapper((char *)filename, "rb", mode, &handle->opened_path);
 
 	if (stream) {
-#if HAVE_MMAP
+#if HAVE_MMAP || defined(PHP_WIN32)
 		size_t page_size = REAL_PAGE_SIZE;
 #endif
 
@@ -1230,7 +1230,7 @@
 		memset(&handle->handle.stream.mmap, 0, sizeof(handle->handle.stream.mmap));
 		len = php_zend_stream_fsizer(stream TSRMLS_CC);
 		if (len != 0
-#if HAVE_MMAP
+#if HAVE_MMAP || defined(PHP_WIN32)
 		&& ((len - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD
 #endif
 		&& php_stream_mmap_possible(stream)