helly Fri Dec 22 00:57:52 2006 UTC
Modified files:
/php-src/ext/spl php_spl.c
Log:
- Fix memory allocation/deallocation to match
http://cvs.php.net/viewvc.cgi/php-src/ext/spl/php_spl.c?r1=1.104&r2=1.105&diff_format=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.104 php-src/ext/spl/php_spl.c:1.105
--- php-src/ext/spl/php_spl.c:1.104 Wed Dec 20 22:11:14 2006
+++ php-src/ext/spl/php_spl.c Fri Dec 22 00:57:51 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.104 2006/12/20 22:11:14 helly Exp $ */
+/* $Id: php_spl.c,v 1.105 2006/12/22 00:57:51 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -282,7 +282,7 @@
RETURN_FALSE;
}
- copy = pos1 = zend_zstrndup(ZEND_STR_TYPE, file_exts, file_exts_len);
+ copy = pos1 = ezstrndup(ZEND_STR_TYPE, file_exts, file_exts_len);
lc_name = zend_u_str_tolower_dup(ZEND_STR_TYPE, class_name,
class_name_len);
while(pos1.v && (unicode ? *pos1.u : *pos1.s) && !EG(exception)) {
EG(return_value_ptr_ptr) = original_return_value;
@@ -310,12 +310,9 @@
}
efree(lc_name.v);
-#if MBO_0
- /* UTODO: This is actually correct but sometimesfails in tests, no idea
why */
if (copy.v) {
efree(copy.v);
}
-#endif
EG(return_value_ptr_ptr) = original_return_value;
EG(opline_ptr) = original_opline_ptr;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
