com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/date/php _date.c

From: Date: Thu, 30 May 2019 18:14:04 +0000
Subject: com php-src: Merge branch 'PHP-7.3' into PHP-7.4: ext/date/php _date.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-106468@lists.php.net to get a copy of this message
Commit: a08b3b6d1924276662ea80d155c4f9e18147e1a0 Author: Craig Duncan <duncan3dc@php.net> Thu, 30 May 2019 19:14:04 +0100 Parents: ee565529138891e757727de230af9051caeda05d 370997fb5d2d6d2248064a6047d25d7794118470 Branches: PHP-7.4 Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a08b3b6d1924276662ea80d155c4f9e18147e1a0 Log: Merge branch 'PHP-7.3' into PHP-7.4 * PHP-7.3: Add a test for bug #65672 Ensure the internal properties cannot be overwritten Bugs: https://bugs.php.net/65672 Changed paths: MM ext/date/php_date.c Diff: diff --cc ext/date/php_date.c index 94f173b,db08395...f7db8a2 --- a/ext/date/php_date.c +++ b/ext/date/php_date.c @@@ -5339,10 -5345,17 +5362,18 @@@ static zval *date_period_read_property( /* }}} */ /* {{{ date_period_write_property */ -static void date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot) +static zval *date_period_write_property(zval *object, zval *member, zval *value, void **cache_slot) { - zend_throw_error(NULL, "Writing to DatePeriod properties is unsupported"); + zend_string *name = zval_get_string(member); + if (date_period_is_magic_property(name)) { + zend_throw_error(NULL, "Writing to DatePeriod->%s is unsupported", ZSTR_VAL(name)); + zend_string_release(name); - return; ++ return value; + } + zend_string_release(name); + + std_object_handlers.write_property(object, member, value, cache_slot); + return value; } /* }}} */

« previous php.cvs (#106468) next »