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

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix freeing of dynamic call name
---

e0a31cee32461b48e41401926013bec513a97656
diff --cc Zend/zend_vm_execute.h
index cc6861d527,b015558084..859f8bf9d7
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@@ -3018,6 -3105,7 +3016,7 @@@ try_function_name
  		call = NULL;
  	}
  
 -	zval_ptr_dtor_nogc(free_op2);
++	zval_ptr_dtor_nogc(EX_VAR(opline->op2.var));
  	if (UNEXPECTED(!call)) {
  		HANDLE_EXCEPTION();
  	}