]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4'
authorChristoph M. Becker <cmbecker69@gmx.de>
Mon, 11 May 2020 14:25:30 +0000 (16:25 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Mon, 11 May 2020 14:25:30 +0000 (16:25 +0200)
* PHP-7.4:
  Fix #79571: FFI: var_dumping unions may segfault

1  2 
ext/ffi/ffi.c

diff --cc ext/ffi/ffi.c
index 7784c7b3894bcda185f3b934cf80dcd8c08675ba,fa818682308719453f0347c527f5b96681dc2c78..2d3369476458fc175a185bb139ebd52c6f519053
@@@ -2345,8 -2372,11 +2348,8 @@@ static zval *zend_ffi_read_var(zend_obj
                return &EG(uninitialized_zval);
        }
  
 -      zend_tmp_string_release(tmp_var_name);
 -
        if (sym->kind == ZEND_FFI_SYM_VAR) {
-               zend_ffi_cdata_to_zval(NULL, sym->addr, ZEND_FFI_TYPE(sym->type), read_type, rv, (zend_ffi_flags)sym->is_const, 0);
+               zend_ffi_cdata_to_zval(NULL, sym->addr, ZEND_FFI_TYPE(sym->type), read_type, rv, (zend_ffi_flags)sym->is_const, 0, 0);
        } else if (sym->kind == ZEND_FFI_SYM_FUNC) {
                zend_ffi_cdata *cdata;
                zend_ffi_type *new_type = emalloc(sizeof(zend_ffi_type));