svn: /php/php-src/trunk/ext/spl/ spl_observer.c
| From: | Felipe Pena | Date: | Mon, 10 May 2010 01:39:58 +0000 |
| Subject: | svn: /php/php-src/trunk/ext/spl/ spl_observer.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62587@lists.php.net to get a copy of this message | ||
felipe Mon, 10 May 2010 01:39:58 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299192
Log:
- Fix crash when instantiating MultipleIterator
Changed paths:
U php/php-src/trunk/ext/spl/spl_observer.c
Modified: php/php-src/trunk/ext/spl/spl_observer.c
===================================================================
--- php/php-src/trunk/ext/spl/spl_observer.c 2010-05-09 21:16:14 UTC (rev 299191)
+++ php/php-src/trunk/ext/spl/spl_observer.c 2010-05-10 01:39:58 UTC (rev 299192)
@@ -274,7 +274,7 @@
if (class_type != spl_ce_SplObjectStorage) {
zend_hash_find(&class_type->function_table, "gethash",
sizeof("gethash"), (void **) &intern->fptr_get_hash);
- if (intern->fptr_get_hash->common.scope == spl_ce_SplObjectStorage) {
+ if (intern->fptr_get_hash && intern->fptr_get_hash->common.scope ==
spl_ce_SplObjectStorage) {
intern->fptr_get_hash = NULL;
}
}