diff options
| author | Andrei Zmievski <andrei@php.net> | 2006-02-07 00:33:13 +0000 |
|---|---|---|
| committer | Andrei Zmievski <andrei@php.net> | 2006-02-07 00:33:13 +0000 |
| commit | da30791861a47802bc35bb2c253106df09d8f770 (patch) | |
| tree | 6518fa0e7e514dc2880da1b57166ee44569194a6 | |
| parent | 0473a11ca23e976f8c41e0b654f143c767036f1f (diff) | |
| download | php-git-da30791861a47802bc35bb2c253106df09d8f770.tar.gz | |
MFH.
| -rw-r--r-- | Zend/zend_builtin_functions.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 5052f7b5e0..af2f1b039b 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -768,11 +768,16 @@ ZEND_FUNCTION(get_object_vars) RETURN_FALSE; } + properties = Z_OBJ_HT_PP(obj)->get_properties(*obj TSRMLS_CC); + + if (properties == NULL) { + RETURN_FALSE; + } + instanceof = EG(This) && instanceof_function(Z_OBJCE_P(EG(This)), Z_OBJCE_PP(obj) TSRMLS_CC); array_init(return_value); - properties = Z_OBJ_HT_PP(obj)->get_properties(*obj TSRMLS_CC); zend_hash_internal_pointer_reset_ex(properties, &pos); while (zend_hash_get_current_data_ex(properties, (void **) &value, &pos) == SUCCESS) { |