From 653e374b6b1c4ce89ef4bb74cd1387f8b859f35c Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Thu, 15 Sep 2011 11:30:17 +0000 Subject: [PATCH] Fixed bug #50982 (incorrect assumption of PAGE_SIZE size) --- Zend/zend_stream.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index 88ef53bdb0..88d0817380 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -27,10 +27,24 @@ #include #include -#if HAVE_SYS_MMAN_H -# include -# ifndef PAGE_SIZE -# define PAGE_SIZE 4096 +#if HAVE_MMAP +# if HAVE_UNISTD_H +# include +# if defined(_SC_PAGESIZE) +# define REAL_PAGE_SIZE sysconf(_SC_PAGESIZE); +# elif defined(_SC_PAGE_SIZE) +# define REAL_PAGE_SIZE sysconf(_SC_PAGE_SIZE); +# endif +# endif +# if HAVE_SYS_MMAN_H +# include +# endif +# ifndef REAL_PAGE_SIZE +# ifdef PAGE_SIZE +# define REAL_PAGE_SIZE PAGE_SIZE +# else +# define REAL_PAGE_SIZE 4096 +# endif # endif #endif @@ -215,9 +229,11 @@ ZEND_API int zend_stream_fixup(zend_file_handle *file_handle, char **buf, size_t if (old_type == ZEND_HANDLE_FP && !file_handle->handle.stream.isatty && size) { #if HAVE_MMAP + size_t page_size = REAL_PAGE_SIZE; + if (file_handle->handle.fp && size != 0 && - ((size - 1) % PAGE_SIZE) <= PAGE_SIZE - ZEND_MMAP_AHEAD) { + ((size - 1) % page_size) <= page_size - ZEND_MMAP_AHEAD) { /* *buf[size] is zeroed automatically by the kernel */ *buf = mmap(0, size + ZEND_MMAP_AHEAD, PROT_READ, MAP_PRIVATE, fileno(file_handle->handle.fp), 0); if (*buf != MAP_FAILED) { -- 2.50.1