Add some ValueErrors to ext/date

Girgias · Girgias · commit fef9ba0e6e01 · 2020-09-09T15:59:53.000+02:00
diff --git a/ext/date/php_date.c b/ext/date/php_date.c
@@ -549,7 +549,7 @@ PHPAPI timelib_tzinfo *get_timezone_info(void)
 	tz = guess_timezone(DATE_TIMEZONEDB);
 	tzi = php_date_parse_tzfile(tz, DATE_TIMEZONEDB);
 	if (! tzi) {
-		php_error_docref(NULL, E_ERROR, "Timezone database is corrupt - this should *never* happen!");
+		zend_throw_error(NULL, "Timezone database is corrupt. Please file a bug report as this should never happen");
 	}
 	return tzi;
 }
@@ -950,8 +950,8 @@ PHP_FUNCTION(idate)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ZSTR_LEN(format) != 1) {
-		php_error_docref(NULL, E_WARNING, "idate format is one char");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "must be one character");
+		RETURN_THROWS();
 	}
 
 	if (ts_is_null) {
@@ -960,8 +960,8 @@ PHP_FUNCTION(idate)
 
 	ret = php_idate(ZSTR_VAL(format)[0], ts, 0);
 	if (ret == -1) {
-		php_error_docref(NULL, E_WARNING, "Unrecognized date format token.");
-		RETURN_FALSE;
+		zend_argument_value_error(1, "must be a valid date format token");
+		RETURN_THROWS();
 	}
 	RETURN_LONG(ret);
 }
@@ -1021,6 +1021,12 @@ PHP_FUNCTION(strtotime)
 		Z_PARAM_LONG_OR_NULL(preset_ts, preset_ts_is_null)
 	ZEND_PARSE_PARAMETERS_END();
 
+	/* timelib_strtotime() expects the string to not be empty */
+	if (ZSTR_LEN(times) == 0) {
+		/* TODO Add a Warning? */
+		RETURN_FALSE;
+	}
+
 	tzi = get_timezone_info();
 
 	now = timelib_time_ctor();
@@ -1033,18 +1039,26 @@ PHP_FUNCTION(strtotime)
 		DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 	error1 = error->error_count;
 	timelib_error_container_dtor(error);
+	if (error1) {
+		timelib_time_dtor(now);
+		timelib_time_dtor(t);
+		RETURN_FALSE;
+	}
+
 	timelib_fill_holes(t, now, TIMELIB_NO_CLONE);
 	timelib_update_ts(t, tzi);
 	ts = timelib_date_to_int(t, &error2);
 
 	timelib_time_dtor(now);
 	timelib_time_dtor(t);
 
-	if (error1 || error2) {
+	/* Seconds since epoch must fit in a zend_long */
+	if (error2) {
+		/* TODO Add warning? */
 		RETURN_FALSE;
-	} else {
-		RETURN_LONG(ts);
 	}
+
+	RETURN_LONG(ts);
 }
 /* }}} */
 
@@ -1115,14 +1129,18 @@ PHPAPI void php_mktime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 
 	/* Clean up and return */
 	ts = timelib_date_to_int(now, &error);
-	ts += adjust_seconds;
-	timelib_time_dtor(now);
 
+	/* Seconds since epoch must fit in a zend_long */
 	if (error) {
+		timelib_time_dtor(now);
+		/* TODO Add warning? */
 		RETURN_FALSE;
-	} else {
-		RETURN_LONG(ts);
 	}
+
+	ts += adjust_seconds;
+	timelib_time_dtor(now);
+
+	RETURN_LONG(ts);
 }
 /* }}} */
 
@@ -1179,6 +1197,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 	ZEND_PARSE_PARAMETERS_END();
 
 	if (ZSTR_LEN(format) == 0) {
+		/* TODO Add a warning? */
 		RETURN_FALSE;
 	}
 
@@ -1223,7 +1242,7 @@ PHPAPI void php_strftime(INTERNAL_FUNCTION_PARAMETERS, int gmt)
 		ta.tm_zone = offset->abbr;
 #endif
 	}
-
+	// TODO Cleanup as bug is not present anymore? (Need to update link as MS retired connect.microsoft.com)
 	/* VS2012 crt has a bug where strftime crash with %z and %Z format when the
 	   initial buffer is too small. See
 	   http://connect.microsoft.com/VisualStudio/feedback/details/759720/vs2012-strftime-crash-with-z-formatting-code */
@@ -2780,7 +2799,7 @@ static int php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{
 	dateobj = Z_PHPDATE_P(object);
 
 	if (!(dateobj->time)) {
-		php_error_docref(NULL, E_WARNING, "The DateTime object has not been correctly initialized by its constructor");
+		zend_throw_error(NULL, "The DateTime object has not been correctly initialized by its constructor");
 		return 0;
 	}
 
@@ -3318,11 +3337,14 @@ PHP_FUNCTION(date_timestamp_get)
 	timelib_update_ts(dateobj->time, NULL);
 
 	timestamp = timelib_date_to_int(dateobj->time, &error);
+
+	/* Seconds since epoch must fit in a zend_long */
 	if (error) {
+		/* TODO Add warning? */
 		RETURN_FALSE;
-	} else {
-		RETVAL_LONG(timestamp);
 	}
+
+	RETURN_LONG(timestamp);
 }
 /* }}} */
 
@@ -3386,7 +3408,7 @@ PHP_FUNCTION(timezone_open)
 	php_timezone_obj *tzobj;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(tz)
+		Z_PARAM_PATH_STR(tz) /* To prevent nul bytes */
 	ZEND_PARSE_PARAMETERS_END();
 
 	tzobj = Z_PHPTIMEZONE_P(php_date_instantiate(date_ce_timezone, return_value));
@@ -3405,7 +3427,7 @@ PHP_METHOD(DateTimeZone, __construct)
 	zend_error_handling error_handling;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(tz)
+		Z_PARAM_PATH_STR(tz) /* To prevent nul bytes */
 	ZEND_PARSE_PARAMETERS_END();
 
 	zend_replace_error_handling(EH_THROW, NULL, &error_handling);
@@ -4321,6 +4343,7 @@ PHP_FUNCTION(timezone_identifiers_list)
 
 	/* Extra validation */
 	if (what == PHP_DATE_TIMEZONE_PER_COUNTRY && option_len != 2) {
+		// Promoto to ValueError?
 		php_error_docref(NULL, E_NOTICE, "A two-letter ISO 3166-1 compatible country code is expected");
 		RETURN_FALSE;
 	}
diff --git a/ext/date/php_date.stub.php b/ext/date/php_date.stub.php
@@ -6,7 +6,7 @@ function strtotime(string $datetime, ?int $baseTimestamp = null): int|false {}
 
 function date(string $format, ?int $timestamp = null): string {}
 
-function idate(string $format, ?int $timestamp = null): int|false {}
+function idate(string $format, ?int $timestamp = null): int {}
 
 function gmdate(string $format, ?int $timestamp = null): string {}
 
@@ -73,7 +73,7 @@ function date_isodate_set(DateTime $object, int $year, int $week, int $day = 1):
 
 function date_timestamp_set(DateTime $object, int $timestamp): DateTime {}
 
-function date_timestamp_get(DateTimeInterface $object): int|false {}
+function date_timestamp_get(DateTimeInterface $object): int {}
 
 function timezone_open(string $timezone): DateTimeZone|false {}
 
diff --git a/ext/date/php_date_arginfo.h b/ext/date/php_date_arginfo.h
@@ -1,5 +1,5 @@
 /* This is a generated file, edit the .stub.php file instead.
- * Stub hash: fee95924adec03c89fdd677ec26bb6eea34d4b3c */
+ * Stub hash: a1b54f5aa27f583fb84953c1aa3f5d901ceb9f9d */
 
 ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_strtotime, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, datetime, IS_STRING, 0)
@@ -11,7 +11,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_date, 0, 1, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_idate, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
+ZEND_BEGIN_ARG_WITH_RETURN_TYPE_INFO_EX(arginfo_idate, 0, 1, IS_LONG, 0)
 	ZEND_ARG_TYPE_INFO(0, format, IS_STRING, 0)
 	ZEND_ARG_TYPE_INFO_WITH_DEFAULT_VALUE(0, timestamp, IS_LONG, 1, "null")
 ZEND_END_ARG_INFO()
@@ -151,9 +151,7 @@ ZEND_BEGIN_ARG_WITH_RETURN_OBJ_INFO_EX(arginfo_date_timestamp_set, 0, 2, DateTim
 	ZEND_ARG_TYPE_INFO(0, timestamp, IS_LONG, 0)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_WITH_RETURN_TYPE_MASK_EX(arginfo_date_timestamp_get, 0, 1, MAY_BE_LONG|MAY_BE_FALSE)
-	ZEND_ARG_OBJ_INFO(0, object, DateTimeInterface, 0)
-ZEND_END_ARG_INFO()
+#define arginfo_date_timestamp_get arginfo_date_offset_get
 
 ZEND_BEGIN_ARG_WITH_RETURN_OBJ_TYPE_MASK_EX(arginfo_timezone_open, 0, 1, DateTimeZone, MAY_BE_FALSE)
 	ZEND_ARG_TYPE_INFO(0, timezone, IS_STRING, 0)
diff --git a/ext/date/tests/005.phpt b/ext/date/tests/005.phpt
@@ -6,30 +6,42 @@ date_default_timezone_set('UTC');
 
 $t = mktime(0,0,0, 6, 27, 2006);
 
-var_dump(idate(1,1));
-var_dump(idate(""));
-var_dump(idate(0));
+try {
+    var_dump(idate(1,1));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(idate(""));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(idate(0));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 var_dump(idate("B", $t));
-var_dump(idate("[", $t));
-var_dump(idate("'"));
+
+try {
+    var_dump(idate("[", $t));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(idate("'"));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 
 echo "Done\n";
 ?>
---EXPECTF--
-Warning: idate(): Unrecognized date format token. in %s on line %d
-bool(false)
-
-Warning: idate(): idate format is one char in %s on line %d
-bool(false)
-
-Warning: idate(): Unrecognized date format token. in %s on line %d
-bool(false)
+--EXPECT--
+idate(): Argument #1 ($format) must be a valid date format token
+idate(): Argument #1 ($format) must be one character
+idate(): Argument #1 ($format) must be a valid date format token
 int(41)
-
-Warning: idate(): Unrecognized date format token. in %s on line %d
-bool(false)
-
-Warning: idate(): Unrecognized date format token. in %s on line %d
-bool(false)
+idate(): Argument #1 ($format) must be a valid date format token
+idate(): Argument #1 ($format) must be a valid date format token
 Done
diff --git a/ext/date/tests/bug70277.phpt b/ext/date/tests/bug70277.phpt
@@ -3,15 +3,17 @@ Bug #70277 (new DateTimeZone($foo) is ignoring text after null byte)
 --FILE--
 <?php
 $timezone = "Europe/Zurich\0Foo";
-var_dump(timezone_open($timezone));
-var_dump(new DateTimeZone($timezone));
+try {
+    var_dump(timezone_open($timezone));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
+try {
+    var_dump(new DateTimeZone($timezone));
+} catch (\ValueError $e) {
+    echo $e->getMessage() . \PHP_EOL;
+}
 ?>
---EXPECTF--
-Warning: timezone_open(): Timezone must not contain null bytes in %sbug70277.php on line %d
-bool(false)
-
-Fatal error: Uncaught Exception: DateTimeZone::__construct(): Timezone must not contain null bytes in %sbug70277.php:%d
-Stack trace:
-#0 %sbug70277.php(%d): DateTimeZone->__construct('Europe/Zurich\x00F...')
-#1 {main}
-  thrown in %sbug70277.php on line %d
+--EXPECT--
+timezone_open(): Argument #1 ($timezone) must not contain any null bytes
+DateTimeZone::__construct(): Argument #1 ($timezone) must not contain any null bytes
