From: Nikita Popov <nikita.ppv@gmail.com>
Date: Wed, 18 Dec 2019 09:24:41 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=48d5100738d4a623a20b68c20ce0316c2e12a765;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix use-after-free when trying to write to closure property
---

48d5100738d4a623a20b68c20ce0316c2e12a765
diff --cc Zend/zend_closures.c
index 63b91aacbd,92f1398d84..b1bebaded4
--- a/Zend/zend_closures.c
+++ b/Zend/zend_closures.c
@@@ -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);
  }
  /* }}} */