From: Dmitry Stogov <dmitry@zend.com>
Date: Thu, 26 Dec 2013 07:51:32 +0000 (+0400)
Subject: Fixed ZEND_MM_MEM_TYPE=mmap_zero
X-Git-Tag: php-5.6.0alpha1~84^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6414fe283e3931d87416a155f4cfbaaf5ffca1ad;p=php

Fixed ZEND_MM_MEM_TYPE=mmap_zero
---

diff --git a/NEWS b/NEWS
index 38659e6076..eecd4e8002 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ PHP                                                                        NEWS
   . Disallowed JMP into a finally block. (Laruence)
   . Added validation of class names in the autoload process. (Dmitry)
   . Fixed invalid C code in zend_strtod.c. (Lior Kaplan)
+  . Fixed ZEND_MM_MEM_TYPE=mmap_zero. (Dmitry, Tony)
   . Fixed bug #66041 (list() fails to unpack yielded ArrayAccess object).
     (Nikita)
   . Fixed bug #65764 (generators/throw_rethrow FAIL with
diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c
index bf9d000437..c3d322aa8f 100644
--- a/Zend/zend_alloc.c
+++ b/Zend/zend_alloc.c
@@ -201,7 +201,7 @@ static int zend_mm_dev_zero_fd = -1;
 
 static zend_mm_storage* zend_mm_mem_mmap_zero_init(void *params)
 {
-	if (zend_mm_dev_zero_fd != -1) {
+	if (zend_mm_dev_zero_fd == -1) {
 		zend_mm_dev_zero_fd = open("/dev/zero", O_RDWR, S_IRUSR | S_IWUSR);
 	}
 	if (zend_mm_dev_zero_fd >= 0) {