com php-src: old_size is already known: Zend/zend _alloc.c

From: Date: Mon, 19 Jan 2015 12:26:04 +0000
Subject: com php-src: old_size is already known: Zend/zend _alloc.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-84175@lists.php.net to get a copy of this message
Commit: eb8d7fe71075f9dd492a2d5111e33b082b2f3401 Author: Dmitry Stogov <dmitry@zend.com> Mon, 19 Jan 2015 15:26:04 +0300 Parents: 2efa53649e50ea180e3214a608e8777e80777e9f Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eb8d7fe71075f9dd492a2d5111e33b082b2f3401 Log: old_size is already known Changed paths: M Zend/zend_alloc.c Diff: diff --git a/Zend/zend_alloc.c b/Zend/zend_alloc.c index 2a6b950..7c054e2 100644 --- a/Zend/zend_alloc.c +++ b/Zend/zend_alloc.c @@ -1558,7 +1558,6 @@ static void *zend_mm_realloc_heap(zend_mm_heap *heap, void *ptr, size_t size ZEN } /* Naive reallocation */ - old_size = zend_mm_size(heap, ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); ret = zend_mm_alloc_heap(heap, size ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC); memcpy(ret, ptr, MIN(old_size, size)); zend_mm_free_heap(heap, ptr ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC);

« previous php.cvs (#84175) next »