From ef4c06c0837dda07cd346654ceac6e3be4eb5b22 Mon Sep 17 00:00:00 2001 From: Andrei Zmievski Date: Tue, 7 Feb 2006 00:32:16 +0000 Subject: [PATCH] Check for get_properties handler before using it. (Patch from rrichards@ctindustries.net). --- Zend/zend_builtin_functions.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Zend/zend_builtin_functions.c b/Zend/zend_builtin_functions.c index 13fdc96e1d..95dc9efc35 100644 --- a/Zend/zend_builtin_functions.c +++ b/Zend/zend_builtin_functions.c @@ -814,11 +814,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) { -- 2.50.1