Skip to content

Commit de9574e

Browse files
committed
Fixed bug #39640 (Segfault with "Allowed memory size exhausted")
1 parent e8e9810 commit de9574e

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

NEWS

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,7 @@ PHP NEWS
5858
- Fixed bug #39652 (Wrong negative results from memeory_get_usage()). (Dmitry)
5959
- Fixed bug #39648 (Implementation of PHP functions chown() and chgrp() are not
6060
thread safe). (Ilia, wharmby at uk dot ibm dot com)
61+
- Fixed bug #39640 (Segfault with "Allowed memory size exhausted"). (Dmitry)
6162
- Fixed bug #39623 (thread safety fixes on *nix for putenv() & mime_magic).
6263
(Ilia, wharmby at uk dot ibm dot com)
6364
- Fixed bug #39621 (str_replace() is not binary safe on strings with equal

Zend/zend_alloc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -438,7 +438,7 @@ static long _mem_block_end_magic = MEM_BLOCK_END_MAGIC;
438438

439439
#else
440440

441-
# define ZEND_MM_VALID_PTR(ptr) 1
441+
# define ZEND_MM_VALID_PTR(ptr) (ptr != NULL)
442442

443443
# define ZEND_MM_SET_MAGIC(block, val)
444444

0 commit comments

Comments
 (0)