com php-src: Merge branch 'PHP-7.4': ext/ffi/ffi.c
| From: | Dmitry Stogov | Date: | Tue, 12 Feb 2019 08:21:30 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.4': ext/ffi/ffi.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-104570@lists.php.net to get a copy of this message | ||
Commit: 2ccf289d280bcd7dcbc079466e872d5e322057ed
Author: Dmitry Stogov <dmitry@zend.com> Tue, 12 Feb 2019 11:21:30 +0300
Parents: 12d8b0af87727718481788975b620c5740952984 7d4de1a77e6d2f96232a68005cdee4866e3eeb58
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=2ccf289d280bcd7dcbc079466e872d5e322057ed
Log:
Merge branch 'PHP-7.4'
* PHP-7.4:
Fixed possible crash
Changed paths:
MM ext/ffi/ffi.c
Diff:
diff --cc ext/ffi/ffi.c
index 715628b,e223a52..059c48e
--- a/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;