cvs: php-src /ext/unicode unicode_iterators.c

andrei Wed Feb 1 23:53:53 2006 UTC Modified files: /php-src/ext/unicode unicode_iterators.c Log: Check for intern->text before destroying it. http://cvs.php.net/viewcvs.cgi/php-src/ext/unicode/unicode_iterators.c?r1=1.1&r2=1.2&diff_format=u Index: php-src/ext/unicode/unicode_iterators.c diff -u php-src/ext/unicode/unicode_iterators.c:1.1 php-src/ext/unicode/unicode_iterators.c:1.2 --- php-src/ext/unicode/unicode_iterators.c:1.1 Wed Feb 1 23:50:50 2006 +++ php-src/ext/unicode/unicode_iterators.c Wed Feb 1 23:53:53 2006 @@ -14,7 +14,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: unicode_iterators.c,v 1.1 2006/02/01 23:50:50 andrei Exp $ */ +/* $Id: unicode_iterators.c,v 1.2 2006/02/01 23:53:53 andrei Exp $ */ #include "php.h" @@ -46,7 +46,7 @@ zend_hash_destroy(intern->std.properties); FREE_HASHTABLE(intern->std.properties); - zval_ptr_dtor(&intern->text); + if (intern->text) zval_ptr_dtor(&intern->text); efree(object); } @@ -90,6 +90,7 @@ } if (Z_TYPE_P(text) != IS_UNICODE) { + printf("not unicode\n"); zend_throw_exception(U_CLASS_ENTRY(spl_ce_InvalidArgumentException), "Text iterator expects argument to be a Unicode string", 0 TSRMLS_CC); return; }