Ensure the internal properties cannot be overwritten

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index f47ba5bc5435de0c594382753fd2a2676860eb5b..ba4ca6af17a188d4582e626c2ca7dd729622f96a 100644 (file)
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -5310,12 +5310,35 @@ PHP_METHOD(DatePeriod, __wakeup)
 }
 /* }}} */
 
+/* {{{ date_period_is_magic_property
+ *  Common for date_period_read_property() and date_period_write_property() functions
+ */
+static int date_period_is_magic_property(zend_string *name)
+{
+       if (zend_string_equals_literal(name, "recurrences")
+               || zend_string_equals_literal(name, "include_start_date")
+               || zend_string_equals_literal(name, "start")
+               || zend_string_equals_literal(name, "current")
+               || zend_string_equals_literal(name, "end")
+               || zend_string_equals_literal(name, "interval")
+       ) {
+               return 1;
+       }
+       return 0;
+}
+/* }}} */
+
 /* {{{ date_period_read_property */
 static zval *date_period_read_property(zval *object, zval *member, int type, void **cache_slot, zval *rv)
 {
        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);
+               zend_string *name = zval_get_string(member);
+               if (date_period_is_magic_property(name)) {
+                       zend_throw_error(NULL, "Retrieval of DatePeriod->%s for modification is unsupported", ZSTR_VAL(name));
+                       zend_string_release(name);
+                       return &EG(uninitialized_zval);
+               }
+               zend_string_release(name);
        }
 
        Z_OBJPROP_P(object); /* build properties hash table */
@@ -5327,7 +5350,15 @@ static zval *date_period_read_property(zval *object, zval *member, int type, voi
 /* {{{ date_period_write_property */
 static void 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;
+       }
+       zend_string_release(name);
+
+       std_object_handlers.write_property(object, member, value, cache_slot);
 }
 /* }}} */
 

diff --git a/ext/date/tests/DatePeriod_properties2.phpt b/ext/date/tests/DatePeriod_properties2.phpt
index 01858e68d4ce81b1a6f6f3c5fe417904960e4804..044746c024abca0959214b78e3e7ddf8341e60ae 100644 (file)
--- a/ext/date/tests/DatePeriod_properties2.phpt
+++ b/ext/date/tests/DatePeriod_properties2.phpt
@@ -32,15 +32,15 @@ foreach ($properties as $property) {
 
 ?>
 --EXPECT--
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
-Writing to DatePeriod properties is unsupported
-Retrieval of DatePeriod properties for modification is unsupported
+Writing to DatePeriod->recurrences is unsupported
+Retrieval of DatePeriod->recurrences for modification is unsupported
+Writing to DatePeriod->include_start_date is unsupported
+Retrieval of DatePeriod->include_start_date for modification is unsupported
+Writing to DatePeriod->start is unsupported
+Retrieval of DatePeriod->start for modification is unsupported
+Writing to DatePeriod->current is unsupported
+Retrieval of DatePeriod->current for modification is unsupported
+Writing to DatePeriod->end is unsupported
+Retrieval of DatePeriod->end for modification is unsupported
+Writing to DatePeriod->interval is unsupported
+Retrieval of DatePeriod->interval for modification is unsupported