summaryrefslogtreecommitdiff
path: root/Zend/zend_object_handlers.c
diff options
context:
space:
mode:
authorDmitry Stogov <dmitry@zend.com>2013-05-21 09:58:11 +0400
committerDmitry Stogov <dmitry@zend.com>2013-05-21 09:58:11 +0400
commit77fffff15762137e2d8173df9b733b4cb70fc996 (patch)
tree6f6f604eb848d770c1147470cdc811dc058da0ba /Zend/zend_object_handlers.c
parent1124b0678f9e60384736c7c1a0d1e84c633a5e7a (diff)
downloadphp-git-77fffff15762137e2d8173df9b733b4cb70fc996.tar.gz
Fixed bug #64720 (SegFault on zend_deactivate)
Diffstat (limited to 'Zend/zend_object_handlers.c')
-rw-r--r--Zend/zend_object_handlers.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Zend/zend_object_handlers.c b/Zend/zend_object_handlers.c
index cc45d35ecd..c2bb056a9a 100644
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@ -1278,6 +1278,14 @@ ZEND_API zval **zend_std_get_static_property(zend_class_entry *ce, const char *p
}
}
+ if (UNEXPECTED(CE_STATIC_MEMBERS(ce) == NULL) ||
+ UNEXPECTED(CE_STATIC_MEMBERS(ce)[property_info->offset] == NULL)) {
+ if (!silent) {
+ zend_error_noreturn(E_ERROR, "Access to undeclared static property: %s::$%s", ce->name, property_name);
+ }
+ return NULL;
+ }
+
return &CE_STATIC_MEMBERS(ce)[property_info->offset];
}
/* }}} */