]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorNikita Popov <nikita.ppv@gmail.com>
Wed, 18 Dec 2019 09:11:40 +0000 (10:11 +0100)
committerNikita Popov <nikita.ppv@gmail.com>
Wed, 18 Dec 2019 09:11:40 +0000 (10:11 +0100)
* PHP-7.4:
  Fix freeing of dynamic call name

1  2 
Zend/zend_vm_def.h
Zend/zend_vm_execute.h

Simple merge
index cc6861d527ff917cd9b64c34279ac6159da8989c,b015558084b9e3d91d924a562c5a78c2bf2cc8b9..859f8bf9d7ebcaaf7609d46f1f094947a22c708f
@@@ -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();
        }