Merge branch 'PHP-7.4'

* PHP-7.4:
  Fixed possible crash

diff --cc ext/ffi/ffi.c
index 715628b5e54b0080be576637fa4851264aee0976,e223a52a923e532b18a1ee6c0ea3773dae831ab6..059c48e1bcf72753fc9f5114cff22036c382da5c
--- 1/ext/ffi/ffi.c
--- 2/ext/ffi/ffi.c
+++ b/ext/ffi/ffi.c
@@@ -1113,11 -1134,11 +1113,11 @@@ static zval *zend_ffi_cdata_read_dim(ze
  }
  /* }}} */
  
 -static void zend_ffi_cdata_write_dim(zval *object, zval *offset, zval *value) /* {{{ */
 +static void zend_ffi_cdata_write_dim(zend_object *obj, zval *offset, zval *value) /* {{{ */
  {
 -      zend_ffi_cdata *cdata = (zend_ffi_cdata*)Z_OBJ_P(object);
 +      zend_ffi_cdata *cdata = (zend_ffi_cdata*)obj;
        zend_ffi_type  *type = ZEND_FFI_TYPE(cdata->type);
-       zend_long       dim = zval_get_long(offset);
+       zend_long       dim;
        void           *ptr;
        zend_ffi_flags  is_const;