]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 18 Dec 2019 09:24:41 +0000 (10:24 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 18 Dec 2019 09:24:41 +0000 (10:24 +0100)
* PHP-7.4:
  Fix use-after-free when trying to write to closure property

1  2 
Zend/zend_closures.c

index 63b91aacbda2be1f157f541035ad63bec6a097ab,92f1398d840548cf748ddabfd7bc6641aba02ab4..b1bebaded43c89a86b309b4c738db16c743c9be3
@@@ -430,10 -432,10 +430,10 @@@ static ZEND_COLD zval *zend_closure_rea
  }
  /* }}} */
  
 -static ZEND_COLD zval *zend_closure_write_property(zval *object, zval *member, zval *value, void **cache_slot) /* {{{ */
 +static ZEND_COLD zval *zend_closure_write_property(zend_object *object, zend_string *member, zval *value, void **cache_slot) /* {{{ */
  {
        ZEND_CLOSURE_PROPERTY_ERROR();
-       return value;
+       return &EG(error_zval);
  }
  /* }}} */