lbarnaud Sat Apr 25 21:54:40 2009 UTC Modified files: /php-src/ext/spl php_spl.c Log: Fix memleak http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.154&r2=1.155&diff_format=u Index: php-src/ext/spl/php_spl.c diff -u php-src/ext/spl/php_spl.c:1.154 php-src/ext/spl/php_spl.c:1.155 --- php-src/ext/spl/php_spl.c:1.154 Sat Apr 25 21:05:00 2009 +++ php-src/ext/spl/php_spl.c Sat Apr 25 21:54:39 2009 @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_spl.c,v 1.154 2009/04/25 21:05:00 lbarnaud Exp $ */ +/* $Id: php_spl.c,v 1.155 2009/04/25 21:54:39 lbarnaud Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -315,17 +315,10 @@ * The "scope" is determined by an opcode, if it is ZEND_FETCH_CLASS we know function was called indirectly by * the Zend engine. */ - - char *sclass_name; - int sclass_name_len; - - zend_unicode_to_string(ZEND_U_CONVERTER(UG(output_encoding_conv)), &sclass_name, &sclass_name_len, - class_name.u, class_name_len); - if (active_opline->opcode != ZEND_FETCH_CLASS) { - zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Class %s could not be loaded", sclass_name); + zend_throw_exception_ex(spl_ce_LogicException, 0 TSRMLS_CC, "Class %v could not be loaded", class_name.u); } else { - php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %s could not be loaded", sclass_name); + php_error_docref(NULL TSRMLS_CC, E_ERROR, "Class %v could not be loaded", class_name.u); } } } /* }}} */
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php