diff options
| author | Dmitry Stogov <dmitry@php.net> | 2011-09-15 11:30:17 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2011-09-15 11:30:17 +0000 |
| commit | 77bda2614d9105cabced8e6f99c75bd78482f1e5 (patch) | |
| tree | 5c6915bdc85ad82b4d23ec4f7c062ce0127f9a3d /Zend/zend_stream.c | |
| parent | 59ad27b0aaaf6655d963c82c22bb628a3c923e8b (diff) | |
| download | php-git-77bda2614d9105cabced8e6f99c75bd78482f1e5.tar.gz | |
Fixed bug #50982 (incorrect assumption of PAGE_SIZE size)
Diffstat (limited to 'Zend/zend_stream.c')
| -rw-r--r-- | Zend/zend_stream.c | 26 |
1 files changed, 21 insertions, 5 deletions
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c index dcf0ec98da..9abc110041 100644 --- a/Zend/zend_stream.c +++ b/Zend/zend_stream.c @@ -27,10 +27,24 @@ #include <sys/types.h> #include <sys/stat.h> -#if HAVE_SYS_MMAN_H -# include <sys/mman.h> -# ifndef PAGE_SIZE -# define PAGE_SIZE 4096 +#if HAVE_MMAP +# if HAVE_UNISTD_H +# include <unistd.h> +# 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 <sys/mman.h> +# 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) { |