Commit:    93fd9c704b9aae141008274e9f3bd2775116a83a
Author:    Johannes Schlüter <johan...@php.net>         Tue, 29 Jan 2013 
19:47:45 +0100
Parents:   be2f547497c32e845f99516df4785ddb3fbff416
Branches:  PHP-5.3 PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=93fd9c704b9aae141008274e9f3bd2775116a83a

Log:
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)

Bugs:
https://bugs.php.net/64099

Changed paths:
  M  NEWS
  M  Zend/zend_API.h


Diff:
diff --git a/NEWS b/NEWS
index 6a3acec..24a1ba8 100644
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP                                                             
           NEWS
 ?? ??? 2013, PHP 5.3.22
 
 - Zend Engine:
+  . Fixed bug #64099 (Wrong TSRM usage in zend_Register_class alias). 
(Johannes)
   . Fixed bug #63899 (Use after scope error in zend_compile). (Laruence)
 
 - Core
diff --git a/Zend/zend_API.h b/Zend/zend_API.h
index 05170f2..f6f2c46 100644
--- a/Zend/zend_API.h
+++ b/Zend/zend_API.h
@@ -268,9 +268,9 @@ ZEND_API void zend_class_implements(zend_class_entry 
*class_entry TSRMLS_DC, int
 ZEND_API int zend_register_class_alias_ex(const char *name, int name_len, 
zend_class_entry *ce TSRMLS_DC);
 
 #define zend_register_class_alias(name, ce) \
-       zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_DC)
+       zend_register_class_alias_ex(name, sizeof(name)-1, ce TSRMLS_CC)
 #define zend_register_ns_class_alias(ns, name, ce) \
-       zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), 
sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_DC)
+       zend_register_class_alias_ex(ZEND_NS_NAME(ns, name), 
sizeof(ZEND_NS_NAME(ns, name))-1, ce TSRMLS_CC)
 
 ZEND_API int zend_disable_function(char *function_name, uint 
function_name_length TSRMLS_DC);
 ZEND_API int zend_disable_class(char *class_name, uint class_name_length 
TSRMLS_DC);


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to