]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 13:17:28 +0000 (15:17 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Tue, 1 Sep 2020 13:17:28 +0000 (15:17 +0200)
* PHP-7.4:
  Check for null EX(func) in write_property

1  2 
Zend/zend_object_handlers.c

index 063a2747224ee85be316b884604649906893fafc,a0a5e48dee3f75b788845775e1a7f055af3bf8bc..a4ee0feda8a83e37b31ea87299677329f3729236
@@@ -691,8 -809,17 +691,15 @@@ exit
  }
  /* }}} */
  
 -ZEND_API zval *zend_std_write_property(zval *object, zval *member, zval *value, void **cache_slot) /* {{{ */
+ 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(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;