summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2005-12-23 20:32:15 +0000
committerMarcus Boerger <helly@php.net>2005-12-23 20:32:15 +0000
commit9a6a266b16fcd6489fce45fb8920f98ede8815aa (patch)
tree4fe3eb2ad8462f34a1cdf0acf9fb1065930a1998 /Zend/zend_execute.c
parentad61a18a2e6e28f2177e1ffa57b00726203c1f56 (diff)
downloadphp-git-9a6a266b16fcd6489fce45fb8920f98ede8815aa.tar.gz
- MFH Fixed Bug #35785 (SimpleXML memory read error)
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 8e1680d0a4..0e39af6b17 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -548,7 +548,7 @@ static inline void zend_assign_to_object(znode *result, zval **object_ptr, znode
make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */
object = *object_ptr;
- if (object->type != IS_OBJECT || (opcode == ZEND_ASSIGN_OBJ && !Z_OBJ_HT_P(object)->write_property)) {
+ if (!object || object->type != IS_OBJECT || (opcode == ZEND_ASSIGN_OBJ && !Z_OBJ_HT_P(object)->write_property)) {
zend_error(E_WARNING, "Attempt to assign property of non-object");
FREE_OP(free_op2);
if (!RETURN_VALUE_UNUSED(result)) {