Blame SOURCES/php-5.6.5-CVE-2015-1351.patch
|
 |
4c9102 |
From 0a8f28b43212cc2ddbc1f2df710e37b1bec0addd Mon Sep 17 00:00:00 2001
|
|
|
4c9102 |
From: Xinchen Hui <laruence@php.net>
|
|
|
4c9102 |
Date: Thu, 8 Jan 2015 16:32:20 +0800
|
|
|
4c9102 |
Subject: [PATCH] Fixed bug #68677 (Use After Free in OPcache)
|
|
|
4c9102 |
|
|
|
4c9102 |
(cherry picked from commit 777c39f4042327eac4b63c7ee87dc1c7a09a3115)
|
|
|
4c9102 |
---
|
|
|
4c9102 |
ext/opcache/zend_shared_alloc.c | 2 +-
|
|
|
4c9102 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
4c9102 |
|
|
|
4c9102 |
diff --git a/ext/opcache/zend_shared_alloc.c b/ext/opcache/zend_shared_alloc.c
|
|
|
4c9102 |
index bbe26e8..8880b88 100644
|
|
|
4c9102 |
--- a/ext/opcache/zend_shared_alloc.c
|
|
|
4c9102 |
+++ b/ext/opcache/zend_shared_alloc.c
|
|
|
4c9102 |
@@ -346,10 +346,10 @@ void *_zend_shared_memdup(void *source, size_t size, zend_bool free_source TSRML
|
|
|
4c9102 |
retval = ZCG(mem);;
|
|
|
4c9102 |
ZCG(mem) = (void*)(((char*)ZCG(mem)) + ZEND_ALIGNED_SIZE(size));
|
|
|
4c9102 |
memcpy(retval, source, size);
|
|
|
4c9102 |
+ zend_shared_alloc_register_xlat_entry(source, retval);
|
|
|
4c9102 |
if (free_source) {
|
|
|
4c9102 |
interned_efree((char*)source);
|
|
|
4c9102 |
}
|
|
|
4c9102 |
- zend_shared_alloc_register_xlat_entry(source, retval);
|
|
|
4c9102 |
return retval;
|
|
|
4c9102 |
}
|
|
|
4c9102 |
|