archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-18 23:18:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Check for intern->text before destroying it.

Browse source
This commit is contained in:
Andrei Zmievski 2006-02-01 23:53:53 +00:00
parent d4c929764a
commit 2b763aa305
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/unicode/unicode_iterators.c
View file

@ -46,7 +46,7 @@ static void text_iterator_free_storage(void *object TSRMLS_DC)
zend_hash_destroy(intern->std.properties); zend_hash_destroy(intern->std.properties);
FREE_HASHTABLE(intern->std.properties); FREE_HASHTABLE(intern->std.properties);
zval_ptr_dtor(&intern->text); if (intern->text) zval_ptr_dtor(&intern->text);
efree(object); efree(object);
} }
@ -90,6 +90,7 @@ PHP_METHOD(TextIterator, __construct)
} }
if (Z_TYPE_P(text) != IS_UNICODE) { 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); zend_throw_exception(U_CLASS_ENTRY(spl_ce_InvalidArgumentException), "Text iterator expects argument to be a Unicode string", 0 TSRMLS_CC);
return; return;
} }