com php-src: Merge branch 'PHP-7.4': Zend/zend_constants.c ext/date/php_date.c ext/exif/exif.c ext/ffi/ffi. c

Commit: d373d13d4a7cabafd949b7ff48022b1612853cd2 Author: Johannes Schlüter <johannes@php.net> Tue, 12 Feb 2019 15:02:18 +0100 Parents: 5c23370648442f211875574b1145eafb9f31b0a6 10cbf9f886ef234c0b0de61e05cb6b557edbf8ee Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d373d13d4a7cabafd949b7ff48022b1612853cd2 Log: Merge branch 'PHP-7.4' Changed paths: MM Zend/zend_constants.c MM ext/date/php_date.c MM ext/exif/exif.c MM ext/ffi/ffi.c Diff: diff --cc ext/date/php_date.c index 0c1ad6d,8bb310f..011454d --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -5216,23 -5276,16 +5216,16 @@@ PHP_METHOD(DatePeriod, __wakeup /* }}} */ /* {{{ date_period_read_property */ -static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv) +static zval *date_period_read_property(zend_object *object, zend_string *name, int type, void **cache_slot, zval *rv) { - zval *zv; if (type != BP_VAR_IS && type != BP_VAR_R) { zend_throw_error(NULL, "Retrieval of DatePeriod properties for modification is unsupported"); return &EG(uninitialized_zval); } - Z_OBJPROP_P(object); /* build properties hash table */ + object->handlers->get_properties(object); /* build properties hash table */ - zv = zend_std_read_property(object, name, type, cache_slot, rv); - if (Z_TYPE_P(zv) == IS_OBJECT && Z_OBJ_HANDLER_P(zv, clone_obj)) { - /* defensive copy */ - ZVAL_OBJ(zv, Z_OBJ_HANDLER_P(zv, clone_obj)(Z_OBJ_P(zv))); - } - - return zv; - return zend_std_read_property(object, member, type, cache_slot, rv); ++ return zend_std_read_property(object, name, type, cache_slot, rv); } /* }}} */ diff --cc ext/ffi/ffi.c index 715628b,2da7fd4..bae2a77 --- 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;