From: Nikita Popov <nikita.ppv@gmail.com>
Date: Tue, 1 Sep 2020 13:17:28 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88a8ebce6a2ff572058e8cfe056d82b19b21f58f;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Check for null EX(func) in write_property
---

88a8ebce6a2ff572058e8cfe056d82b19b21f58f
diff --cc Zend/zend_object_handlers.c
index 063a274722,a0a5e48dee..a4ee0feda8
--- a/Zend/zend_object_handlers.c
+++ b/Zend/zend_object_handlers.c
@@@ -691,8 -809,17 +691,15 @@@ exit
  }
  /* }}} */
  
+ static zend_always_inline zend_bool property_uses_strict_types() {
+ 	zend_execute_data *execute_data = EG(current_execute_data);
+ 	return execute_data
+ 		&& execute_data->func
+ 		&& ZEND_CALL_USES_STRICT_TYPES(EG(current_execute_data));
+ }
+ 
 -ZEND_API zval *zend_std_write_property(zval *object, zval *member, zval *value, void **cache_slot) /* {{{ */
 +ZEND_API zval *zend_std_write_property(zend_object *zobj, zend_string *name, zval *value, void **cache_slot) /* {{{ */
  {
 -	zend_object *zobj;
 -	zend_string *name, *tmp_name;
  	zval *variable_ptr, tmp;
  	uintptr_t property_offset;
  	zend_property_info *prop_info = NULL;