com php-src: Fixed #68677: ext/opcache/zend_shared_alloc. c
| From: | Xinchen Hui | Date: | Thu, 08 Jan 2015 08:32:20 +0000 |
| Subject: | com php-src: Fixed #68677: ext/opcache/zend_shared_alloc. c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-84029@lists.php.net to get a copy of this message | ||
Commit: 777c39f4042327eac4b63c7ee87dc1c7a09a3115
Author: Xinchen Hui <laruence@php.net> Thu, 8 Jan 2015 16:32:20 +0800
Parents: 7ebdc8d70d7617f2c3353b027663ef54a24a2248
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=777c39f4042327eac4b63c7ee87dc1c7a09a3115
Log:
Fixed #68677
Bugs:
https://bugs.php.net/68677
Changed paths:
M ext/opcache/zend_shared_alloc.c
Diff:
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
index 4036abe..48c16ab 100644
--- a/ext/opcache/zend_shared_alloc.c
+++ b/ext/opcache/zend_shared_alloc.c
@@ -344,10 +344,10 @@ void *_zend_shared_memdup(void *source, size_t size, zend_bool free_source)
retval = ZCG(mem);
ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size));
memcpy(retval, source, size);
+ zend_shared_alloc_register_xlat_entry(source, retval);
if (free_source) {
efree(source);
}
- zend_shared_alloc_register_xlat_entry(source, retval);
return retval;
}