com php-src: Fixed bug (Low probability segfault in zend_arena): NEWS Zend/zend_arena.h
| From: | Xinchen Hui | Date: | Tue, 09 Feb 2016 04:20:11 +0000 |
| Subject: | com php-src: Fixed bug (Low probability segfault in zend_arena): NEWS Zend/zend_arena.h | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90971@lists.php.net to get a copy of this message | ||
Commit: a219fc175333f11c0e2fe90efd25e7d8fee5fdfb
Author: Xinchen Hui <laruence@gmail.com> Tue, 9 Feb 2016 12:20:11 +0800
Parents: 2aa585a505dea5a1e0ba4371f0ef24ce5926b00c
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a219fc175333f11c0e2fe90efd25e7d8fee5fdfb
Log:
Fixed bug (Low probability segfault in zend_arena)
Changed paths:
M NEWS
M Zend/zend_arena.h
Diff:
diff --git a/NEWS b/NEWS
index fce9166..7b1023f 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP NEWS
?? ??? 2016 PHP 7.0.4
- Core:
+ . Fixed bug (Low probability segfault in zend_arena). (Laruence)
. Fixed bug #71485 (Return typehint on interanal func causes Fatal error
when it throws exception). (Laruence)
. Fixed bug #71474 (Crash because of VM stack corruption on Magento2).
diff --git a/Zend/zend_arena.h b/Zend/zend_arena.h
index 7456610..e89e06b 100644
--- a/Zend/zend_arena.h
+++ b/Zend/zend_arena.h
@@ -103,11 +103,12 @@ static zend_always_inline void zend_arena_release(zend_arena **arena_ptr, void
*
zend_arena *arena = *arena_ptr;
while (UNEXPECTED((char*)checkpoint > arena->end) ||
- UNEXPECTED((char*)checkpoint < (char*)arena)) {
+ UNEXPECTED((char*)checkpoint <= (char*)arena)) {
zend_arena *prev = arena->prev;
efree(arena);
*arena_ptr = arena = prev;
}
+ ZEND_ASSERT((char*)checkpoint > (char*)arena && (char*)checkpoint <= arena->end);
arena->ptr = (char*)checkpoint;
}