com php-src: Fixed bug #63305 (zend_mm_heap corrupted with traits): NEWS Zend/tests/bug63305 .phpt Zend/zend_compile.c
| From: | Xinchen Hui | Date: | Tue, 23 Oct 2012 03:34:25 +0000 |
| Subject: | com php-src: Fixed bug #63305 (zend_mm_heap corrupted with traits): NEWS Zend/tests/bug63305 .phpt Zend/zend_compile.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-70444@lists.php.net to get a copy of this message | ||
Commit: 74228c515197c8a3bda878a077d30c9b14482eb2
Author: Xinchen Hui <laruence@php.net> Tue, 23 Oct 2012 11:34:25 +0800
Parents: 7d59b2264e4ea75c34c86df756a2c2795b94753f
Branches: PHP-5.4
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74228c515197c8a3bda878a077d30c9b14482eb2
Log:
Fixed bug #63305 (zend_mm_heap corrupted with traits)
Bugs:
https://bugs.php.net/63305
Changed paths:
M NEWS
A Zend/tests/bug63305.phpt
M Zend/zend_compile.c
Diff:
diff --git a/NEWS b/NEWS
index a13f99d..a039615 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,9 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2012, PHP 5.4.9
+- Core:
+ . Fixed bug #63305 (zend_mm_heap corrupted with traits). (Dmitry, Laruence)
+
- Fileinfo:
. Fixed bug #63248 (Load multiple magic files from a directory under Windows).
(Anatoliy)
diff --git a/Zend/tests/bug63305.phpt b/Zend/tests/bug63305.phpt
new file mode 100644
index 0000000..4bd3a4d
--- /dev/null
+++ b/Zend/tests/bug63305.phpt
@@ -0,0 +1,43 @@
+--TEST--
+Bug #63305 (zend_mm_heap corrupted with traits)
+--FILE--
+<?php
+new Attachment("");
+
+function __autoload($class) {
+ switch ($class) {
+ case "Attachment":
+ eval(<<<'PHP'
+class Attachment extends File {
+}
+PHP
+ );
+ break;
+ case "File":
+ eval(<<<'PHP'
+class File {
+ use TDatabaseObject {
+ TDatabaseObject::__construct as private databaseObjectConstruct;
+ }
+ public function __construct() {
+ }
+}
+PHP
+ );
+ break;
+ case "TDatabaseObject":
+ eval(<<<'PHP'
+trait TDatabaseObject {
+ public function __construct() {
+ }
+}
+PHP
+ );
+ break;
+ }
+ return TRUE;
+}
+echo "okey";
+?>
+--EXPECT--
+okey
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 303eedb..4dd3eaf 100644
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -3885,7 +3885,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int
num_args,
/* if it is 0, no modifieres has been changed */
if (aliases[i]->modifiers) {
- fn_copy.common.fn_flags = aliases[i]->modifiers;
+ fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS;
if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) {
fn_copy.common.fn_flags |= ZEND_ACC_PUBLIC;
}
@@ -3926,7 +3926,7 @@ static int zend_traits_copy_functions(zend_function *fn TSRMLS_DC, int
num_args,
&& (!aliases[i]->trait_method->ce || fn->common.scope ==
aliases[i]->trait_method->ce)
&& (aliases[i]->trait_method->mname_len == fnname_len)
&& (zend_binary_strcasecmp(aliases[i]->trait_method->method_name,
aliases[i]->trait_method->mname_len, fn->common.function_name, fnname_len) == 0)) {
- fn_copy.common..fn_flags = aliases[i]->modifiers;
+ fn_copy.common.fn_flags = aliases[i]->modifiers | ZEND_ACC_ALIAS;
if (!(aliases[i]->modifiers & ZEND_ACC_PPP_MASK)) {
fn_copy..common.fn_flags |= ZEND_ACC_PUBLIC;