diff options
| author | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:47:45 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2013-01-29 19:47:45 +0100 |
| commit | 93fd9c704b9aae141008274e9f3bd2775116a83a (patch) | |
| tree | 112390d1c18e506b010ba63b54f0f42f51a5e6d0 | |
| parent | be2f547497c32e845f99516df4785ddb3fbff416 (diff) | |
| download | php-git-93fd9c704b9aae141008274e9f3bd2775116a83a.tar.gz | |
Fix bug #64099 (Wrong TSRM usage in zend_register_class_alias)
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | Zend/zend_API.h | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -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 05170f287a..f6f2c46ab9 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); |