php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-03-29 03:32:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added checks for destroied objects

Browse Source
This commit is contained in:
Dmitry Stogov
2008-07-26 18:32:39 +00:00
parent 1e355b4173
commit d379f1fd06
1 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Zend/zend_API.c
View File

@@ -2996,6 +2996,15 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint ch
fcc->calling_scope = NULL;
fcc->object_pp = NULL;
if (object_pp && (!*object_pp || Z_TYPE_PP(object_pp) != IS_OBJECT)) {
object_pp = NULL;
}
if (object_pp && Z_TYPE_PP(object_pp) == IS_OBJECT &&
(!EG(objects_store).object_buckets ||
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(object_pp)].valid)) {
return 0;
}
switch (Z_TYPE_P(callable)) {
case IS_STRING:
case IS_UNICODE:
@@ -3144,6 +3153,11 @@ ZEND_API zend_bool zend_is_callable_ex(zval *callable, zval **object_pp, uint ch
return 0;
}
} else {
if (!EG(objects_store).object_buckets ||
!EG(objects_store).object_buckets[Z_OBJ_HANDLE_PP(obj)].valid) {
return 0;
}
fcc->calling_scope = Z_OBJCE_PP(obj); /* TBFixed: what if it's overloaded? */
fcc->object_pp = obj;