helly Wed Dec 21 20:12:44 2005 EDT
Modified files:
/php-src/ext/spl php_spl.c
Log:
- MFB Need to store length (and type) of class name
http://cvs.php.net/viewcvs.cgi/php-src/ext/spl/php_spl.c?r1=1.80&r2=1.81&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.80 php-src/ext/spl/php_spl.c:1.81
--- php-src/ext/spl/php_spl.c:1.80 Sun Dec 18 15:47:03 2005
+++ php-src/ext/spl/php_spl.c Wed Dec 21 20:12:44 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.80 2005/12/18 15:47:03 zeev Exp $ */
+/* $Id: php_spl.c,v 1.81 2005/12/21 20:12:44 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -341,6 +341,7 @@
PHP_FUNCTION(spl_autoload_call)
{
zval **class_name, *retval = NULL;
+ int class_name_len, class_name_type;
char *func_name, *lc_name;
uint func_name_len;
ulong dummy;
@@ -353,7 +354,9 @@
}
if (SPL_G(autoload_functions)) {
- lc_name = zend_u_str_tolower_dup(Z_TYPE_PP(class_name),
Z_UNIVAL_PP(class_name), Z_UNILEN_PP(class_name));
+ class_name_type = Z_TYPE_PP(class_name);
+ class_name_len = Z_UNILEN_PP(class_name);
+ lc_name = zend_u_str_tolower_dup(class_name_type,
Z_UNIVAL_PP(class_name), Z_UNILEN_PP(class_name));
zend_hash_internal_pointer_reset_ex(SPL_G(autoload_functions),
&function_pos);
while(zend_hash_has_more_elements_ex(SPL_G(autoload_functions),
&function_pos) == SUCCESS && !EG(exception)) {
zend_hash_get_current_key_ex(SPL_G(autoload_functions),
&func_name, &func_name_len, &dummy, 0, &function_pos);
@@ -362,7 +365,7 @@
if (retval) {
zval_ptr_dtor(&retval);
}
- if (zend_u_hash_exists(EG(class_table),
Z_TYPE_PP(class_name), lc_name, Z_UNILEN_PP(class_name)+1)) {
+ if (zend_u_hash_exists(EG(class_table),
class_name_type, lc_name, class_name_len+1)) {
break;
}
zend_hash_move_forward_ex(SPL_G(autoload_functions),
&function_pos);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
