Commit:    433089ccb4d4747a01d522e8678664ff17584615
Author:    Xinchen Hui <larue...@php.net>         Thu, 2 Aug 2012 12:30:07 +0800
Parents:   10642aa9e4f1eb694a8f7b514cc234cb24545744
Branches:  PHP-5.3

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=433089ccb4d4747a01d522e8678664ff17584615

Log:
Fixed bug #62716 (munmap() is called with the incorrect length)

Bugs:
https://bugs.php.net/62716

Changed paths:
  M  NEWS
  M  Zend/zend_stream.c


Diff:
diff --git a/NEWS b/NEWS
index b836d4f..97fc6d6 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,8 @@ PHP                                                             
           NEWS
 ?? ??? 2012, PHP 5.3.16
 
 - Core:
+  . Fixed bug #62716 (munmap() is called with the incorrect length). 
+    (slang...@google.com)
   . Fixed bug #60194 (--with-zend-multibyte and --enable-debug reports LEAK
     with run-test.php). (Laruence)
 
diff --git a/Zend/zend_stream.c b/Zend/zend_stream.c
index 5a02ecd..bc5206c 100644
--- a/Zend/zend_stream.c
+++ b/Zend/zend_stream.c
@@ -79,7 +79,7 @@ static size_t zend_stream_stdio_fsizer(void *handle 
TSRMLS_DC) /* {{{ */
 static void zend_stream_unmap(zend_stream *stream TSRMLS_DC) { /* {{{ */
 #if HAVE_MMAP
        if (stream->mmap.map) {
-               munmap(stream->mmap.map, stream->mmap.len);
+               munmap(stream->mmap.map, stream->mmap.len + ZEND_MMAP_AHEAD);
        } else
 #endif
        if (stream->mmap.buf) {


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to