From b5e72f440f8cd96af17b3d46918fdc0aea928fbf Mon Sep 17 00:00:00 2001
From: arshidkv12 <arshidkv12@gmail.com>
Date: Wed, 19 Aug 2026 10:17:48 +0530
Subject: [PATCH 1/6] Fix date error messages for embedded NUL bytes

---
 ext/date/.DS_Store                            | Bin 0 -> 10244 bytes
 ext/date/php_date.c                           | 165 +++++++++---------
 ext/date/php_date.h                           |   2 +-
 ext/date/tests/.DS_Store                      | Bin 0 -> 77828 bytes
 .../22993/dateInterval_create_null_byte.phpt  |  14 ++
 .../tests/22993/dateInterval_nul_byte.phpt    |  18 ++
 .../dateInterval_unserialize_null_byte.phpt   |  14 ++
 .../datePeriod_create_iso8601_null_byte.phpt  |  14 ++
 .../22993/dateTime_modify_embedded_null.phpt  |  16 ++
 .../tests/22993/date_interval_null_byte.phpt  |  14 ++
 .../22993/ini_date_timezone_null_byte.phpt    |  10 ++
 .../tests/22993/nul-byte-error-message.phpt   |  14 ++
 .../tests/22993/timezone_set_null_byte.phpt   |  14 ++
 13 files changed, 214 insertions(+), 81 deletions(-)
 create mode 100644 ext/date/.DS_Store
 create mode 100644 ext/date/tests/.DS_Store
 create mode 100644 ext/date/tests/22993/dateInterval_create_null_byte.phpt
 create mode 100644 ext/date/tests/22993/dateInterval_nul_byte.phpt
 create mode 100644 ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
 create mode 100644 ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
 create mode 100644 ext/date/tests/22993/dateTime_modify_embedded_null.phpt
 create mode 100644 ext/date/tests/22993/date_interval_null_byte.phpt
 create mode 100644 ext/date/tests/22993/ini_date_timezone_null_byte.phpt
 create mode 100644 ext/date/tests/22993/nul-byte-error-message.phpt
 create mode 100644 ext/date/tests/22993/timezone_set_null_byte.phpt

diff --git a/ext/date/.DS_Store b/ext/date/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6f6fc404c8d4e1fd72d983869dd1ab026a8d35ca
GIT binary patch
literal 10244
zcmeHM%~BIV5bg;e%df%G(u0RBy?B5a$RCuKRDc6lLg_)Rm?Z(WTy|6WF$W4OXTA9V
zK7=Qq#MjZUXBM(My96z&ETv|s+1|{|*E9Wf&xD>3k*Ez?>qIsYS*R?ti+H3I?&q2)
znXtu%6u=X?bWAxKQh_!SqfLWhz%XDKFbo(53<LiH1NhG7Vl60Xo`wO#fMMX00X`pW
zRF>6Hj+B%~2Ocs7fSg9NEO<vAATf3*tDzhzDWTA*vIh}DMVMj;1xLTl!y&7o94V>b
zBov%PII{>d6d`8^&X&VTRFyPO!+>ER$$*Wfc{-$kd^(Ee?|WWw=y-vHe%?|w)Z9;5
z@TOz($ofyIsA0Zom|5DUecGiR+M@%i$484N+UP0rupUPn^+g-?kUDgN+MpISsZVWM
zqjf6b{=tFVLR%Ya3sC!5VJEIF)BP=NO{zfOCjLrPyrDMMqiPv^-*jyySXq`Dx1g21
za1%=%*m)@Jtbn&a(Kes(LXHlTT#MyM1TCguT3|%;k&L{r5nS3_C-J!$BR)nj3n_DX
z6vR<70<W7%!z3bTC1s`_Vs8LX<y2pM)=UO57@hTALPG=I=;CJ0m3x#utl2AdM0e+S
zSM-58mAj$<&+@%o8D2iZ-ncSWCNO@XE#Y0sc)EATm=x~{-p^6%$KD;|G;0axN-UDb
z-W_8S-j%3mOr*`Ec{jntj67l3pFPcse3C@%h>UcGy-s+Nes?;a+w14^KSX9~dgjio
zHES(cZ|f()u-<R>2fbRe`<g!;1cB#Vyf>YfZhP3s-ro-Ve$(~aT?ueoZ47zy%Jo~p
zuoevbR!?H<s>7PI<{H^YXJ;Fg(yCq9temgfXImTjRl8UypP$cJ51u}MvEO*_o%+Ei
ztR6*#|6I|M`h5BPjJJqIAL?D-3;bh-pe}(A6=gZPHr8XFTfRhI8{@n?W7x+LYzzCV
zE6;ydev_@?y^Lr-!g*H2NmiN=?TDtB=k89>n}~ak-`J{FCZf}J0NWLf%j`rAiMW<4
zh~g)&UypFzdXQm?VZbn87%&VN1`GqYn1Lx}o6YzCyI24Ie~TF~rWpnd17doozJn_h
znarip!B-SE>N`{}ob-*9lo=x)JcQfjbv!=sb^NoiEzgn*`m3QFDJkJ-mvBgRoBvmS
Z3^4h>$^ZFgThD+e=g-=$=Kq`j{{mW~*S`P&

literal 0
HcmV?d00001

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index 9f9f0a6159ed..e390ccae2c59 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -531,8 +531,8 @@ static PHP_INI_MH(OnUpdate_date_timezone)
 	if (new_value && !timelib_timezone_id_is_valid(ZSTR_VAL(new_value), DATE_TIMEZONEDB)) {
 		php_error_docref(
 			NULL, E_WARNING,
-			"Invalid date.timezone value '%s', using '%s' instead",
-			ZSTR_VAL(new_value),
+			"Invalid date.timezone value '%pS', using '%s' instead",
+			new_value,
 			DATEG(default_timezone) ? DATEG(default_timezone) : "UTC"
 		);
 		return FAILURE;
@@ -2394,7 +2394,7 @@ static void php_date_get_current_time_with_fraction(time_t *sec, suseconds_t *us
 #endif
 }
 
-PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, size_t time_str_len, const char *format, zval *timezone_object, int flags) /* {{{ */
+PHPAPI bool php_date_initialize(php_date_obj *dateobj, const zend_string *time_string, const char *format, zval *timezone_object, int flags) /* {{{ */
 {
 	timelib_time   *now;
 	timelib_tzinfo *tzi = NULL;
@@ -2405,6 +2405,13 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
 	time_t sec;
 	suseconds_t usec;
 	int options = 0;
+	const char *time_str = "";
+	size_t time_str_len = 0;
+
+	if (time_string) {
+		time_str = ZSTR_VAL(time_string);
+		time_str_len = ZSTR_LEN(time_string);
+	}
 
 	if (dateobj->time) {
 		timelib_time_dtor(dateobj->time);
@@ -2428,7 +2435,7 @@ PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, siz
 	/* If called from a constructor throw an exception */
 	if ((flags & PHP_DATE_INIT_CTOR) && err && err->error_count) {
 		/* spit out the first library error message, at least */
-		zend_throw_exception_ex(date_ce_date_malformed_string_exception, 0, "Failed to parse time string (%s) at position %d (%c): %s", time_str,
+		zend_throw_exception_ex(date_ce_date_malformed_string_exception, 0, "Failed to parse time string (%pS) at position %d (%c): %s", time_string,
 			err->error_messages[0].position, err->error_messages[0].character ? err->error_messages[0].character : ' ', err->error_messages[0].message);
 	}
 	if (err && err->error_count) {
@@ -2572,17 +2579,16 @@ PHPAPI bool php_date_initialize_from_ts_double(php_date_obj *dateobj, double ts)
 PHP_FUNCTION(date_create)
 {
 	zval           *timezone_object = NULL;
-	char           *time_str = NULL;
-	size_t          time_str_len = 0;
+	zend_string    *time_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STRING(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
 
 	php_date_instantiate(date_ce_date, return_value);
-	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0)) {
+	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, NULL, timezone_object, 0)) {
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -2593,17 +2599,16 @@ PHP_FUNCTION(date_create)
 PHP_FUNCTION(date_create_immutable)
 {
 	zval           *timezone_object = NULL;
-	char           *time_str = NULL;
-	size_t          time_str_len = 0;
+	zend_string    *time_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STRING(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
 
 	php_date_instantiate(date_ce_immutable, return_value);
-	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, NULL, timezone_object, 0)) {
+	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, NULL, timezone_object, 0)) {
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -2614,12 +2619,13 @@ PHP_FUNCTION(date_create_immutable)
 PHP_FUNCTION(date_create_from_format)
 {
 	zval           *timezone_object = NULL;
-	char           *time_str = NULL, *format_str = NULL;
-	size_t          time_str_len = 0, format_str_len = 0;
+	zend_string    *time_str = NULL;
+	char           *format_str = NULL;
+	size_t          format_str_len = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
 		Z_PARAM_STRING(format_str, format_str_len)
-		Z_PARAM_PATH(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
@@ -2627,7 +2633,7 @@ PHP_FUNCTION(date_create_from_format)
 	if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_date) != SUCCESS) {
 		RETURN_THROWS();
 	}
-	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, PHP_DATE_INIT_FORMAT)) {
+	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, format_str, timezone_object, PHP_DATE_INIT_FORMAT)) {
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -2638,12 +2644,13 @@ PHP_FUNCTION(date_create_from_format)
 PHP_FUNCTION(date_create_immutable_from_format)
 {
 	zval           *timezone_object = NULL;
-	char           *time_str = NULL, *format_str = NULL;
-	size_t          time_str_len = 0, format_str_len = 0;
+	char           *format_str = NULL;
+	zend_string    *time_str = NULL;
+	size_t          format_str_len = 0;
 
 	ZEND_PARSE_PARAMETERS_START(2, 3)
 		Z_PARAM_STRING(format_str, format_str_len)
-		Z_PARAM_PATH(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
@@ -2651,7 +2658,7 @@ PHP_FUNCTION(date_create_immutable_from_format)
 	if (object_init_ex(return_value, execute_data->This.value.ce ? execute_data->This.value.ce : date_ce_immutable) != SUCCESS) {
 		RETURN_THROWS();
 	}
-	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, time_str_len, format_str, timezone_object, PHP_DATE_INIT_FORMAT)) {
+	if (!php_date_initialize(Z_PHPDATE_P(return_value), time_str, format_str, timezone_object, PHP_DATE_INIT_FORMAT)) {
 		zval_ptr_dtor(return_value);
 		RETURN_FALSE;
 	}
@@ -2662,16 +2669,15 @@ PHP_FUNCTION(date_create_immutable_from_format)
 PHP_METHOD(DateTime, __construct)
 {
 	zval *timezone_object = NULL;
-	char *time_str = NULL;
-	size_t time_str_len = 0;
+	zend_string *time_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STRING(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_date_initialize(Z_PHPDATE_P(ZEND_THIS), time_str, time_str_len, NULL, timezone_object, PHP_DATE_INIT_CTOR);
+	php_date_initialize(Z_PHPDATE_P(ZEND_THIS), time_str, NULL, timezone_object, PHP_DATE_INIT_CTOR);
 }
 /* }}} */
 
@@ -2679,16 +2685,15 @@ PHP_METHOD(DateTime, __construct)
 PHP_METHOD(DateTimeImmutable, __construct)
 {
 	zval *timezone_object = NULL;
-	char *time_str = NULL;
-	size_t time_str_len = 0;
+	zend_string *time_str = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(0, 2)
 		Z_PARAM_OPTIONAL
-		Z_PARAM_STRING(time_str, time_str_len)
+		Z_PARAM_PATH_STR(time_str)
 		Z_PARAM_OBJECT_OF_CLASS_OR_NULL(timezone_object, date_ce_timezone)
 	ZEND_PARSE_PARAMETERS_END();
 
-	php_date_initialize(Z_PHPDATE_P(ZEND_THIS), time_str, time_str_len, NULL, timezone_object, PHP_DATE_INIT_CTOR);
+	php_date_initialize(Z_PHPDATE_P(ZEND_THIS), time_str, NULL, timezone_object, PHP_DATE_INIT_CTOR);
 }
 /* }}} */
 
@@ -2883,7 +2888,7 @@ static bool php_date_initialize_from_hash(php_date_obj **dateobj, const HashTabl
 			zend_string *tmp = zend_string_concat3(
 				Z_STRVAL_P(z_date), Z_STRLEN_P(z_date), " ", 1,
 				Z_STRVAL_P(z_timezone), Z_STRLEN_P(z_timezone));
-			bool ret = php_date_initialize(*dateobj, ZSTR_VAL(tmp), ZSTR_LEN(tmp), NULL, NULL, 0);
+			bool ret = php_date_initialize(*dateobj, tmp, NULL, NULL, 0);
 			zend_string_release(tmp);
 			return ret;
 		}
@@ -2903,7 +2908,7 @@ static bool php_date_initialize_from_hash(php_date_obj **dateobj, const HashTabl
 			tzobj->tzi.tz = tzi;
 			tzobj->initialized = true;
 
-			ret = php_date_initialize(*dateobj, Z_STRVAL_P(z_date), Z_STRLEN_P(z_date), NULL, &tmp_obj, 0);
+			ret = php_date_initialize(*dateobj, Z_STR_P(z_date),  NULL, &tmp_obj, 0);
 			zval_ptr_dtor(&tmp_obj);
 			return ret;
 		}
@@ -3258,7 +3263,7 @@ PHP_FUNCTION(date_format)
 }
 /* }}} */
 
-static bool php_date_modify(zval *object, char *modify, size_t modify_len) /* {{{ */
+static bool php_date_modify(zval *object, zend_string *modify) /* {{{ */
 {
 	php_date_obj *dateobj;
 	timelib_time *tmp_time;
@@ -3271,14 +3276,14 @@ static bool php_date_modify(zval *object, char *modify, size_t modify_len) /* {{
 		return false;
 	}
 
-	tmp_time = timelib_strtotime(modify, modify_len, &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
+	tmp_time = timelib_strtotime(ZSTR_VAL(modify), ZSTR_LEN(modify), &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 
 	/* update last errors and warnings */
 	update_errors_warnings(&err);
 
 	if (err && err->error_count) {
 		/* spit out the first library error message, at least */
-		php_error_docref(NULL, E_WARNING, "Failed to parse time string (%s) at position %d (%c): %s", modify,
+		php_error_docref(NULL, E_WARNING, "Failed to parse time string (%pS) at position %d (%c): %s", modify,
 			err->error_messages[0].position,
 			err->error_messages[0].character ? err->error_messages[0].character : ' ',
 			err->error_messages[0].message);
@@ -3343,14 +3348,13 @@ static bool php_date_modify(zval *object, char *modify, size_t modify_len) /* {{
 PHP_FUNCTION(date_modify)
 {
 	zval         *object;
-	char         *modify;
-	size_t        modify_len;
+	zend_string  *modify;
 
-	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "Os", &object, date_ce_date, &modify, &modify_len) == FAILURE) {
+	if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "OS", &object, date_ce_date, &modify) == FAILURE) {
 		RETURN_THROWS();
 	}
 
-	if (!php_date_modify(object, modify, modify_len)) {
+	if (!php_date_modify(object, modify)) {
 		RETURN_FALSE;
 	}
 
@@ -3362,17 +3366,16 @@ PHP_FUNCTION(date_modify)
 PHP_METHOD(DateTime, modify)
 {
 	zval                *object;
-	char                *modify;
-	size_t               modify_len;
+	zend_string         *modify;
 	zend_error_handling  zeh;
 
 	object = ZEND_THIS;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(modify, modify_len)
+		Z_PARAM_STR(modify)
 	ZEND_PARSE_PARAMETERS_END();
 
 	zend_replace_error_handling(EH_THROW, date_ce_date_malformed_string_exception, &zeh);
-	if (!php_date_modify(object, modify, modify_len)) {
+	if (!php_date_modify(object, modify)) {
 		zend_restore_error_handling(&zeh);
 		RETURN_THROWS();
 	}
@@ -3387,19 +3390,18 @@ PHP_METHOD(DateTime, modify)
 PHP_METHOD(DateTimeImmutable, modify)
 {
 	zval *object, new_object;
-	char *modify;
-	size_t   modify_len;
+	zend_string *modify;
 	zend_error_handling zeh;
 
 	object = ZEND_THIS;
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(modify, modify_len)
+		Z_PARAM_STR(modify)
 	ZEND_PARSE_PARAMETERS_END();
 
 	date_clone_immutable(object, &new_object);
 
 	zend_replace_error_handling(EH_THROW, date_ce_date_malformed_string_exception, &zeh);
-	if (!php_date_modify(&new_object, modify, modify_len)) {
+	if (!php_date_modify(&new_object, modify)) {
 		zval_ptr_dtor(&new_object);
 		zend_restore_error_handling(&zeh);
 		RETURN_THROWS();
@@ -4451,7 +4453,7 @@ PHP_FUNCTION(timezone_location_get)
 }
 /* }}} */
 
-static bool date_interval_initialize(timelib_rel_time **rt, const char *format, size_t format_length) /* {{{ */
+static bool date_interval_initialize(timelib_rel_time **rt, const zend_string *format) /* {{{ */
 {
 	timelib_time     *b = NULL, *e = NULL;
 	timelib_rel_time *p = NULL;
@@ -4459,10 +4461,10 @@ static bool date_interval_initialize(timelib_rel_time **rt, const char *format,
 	bool              retval = false;
 	timelib_error_container *errors;
 
-	timelib_strtointerval(format, format_length, &b, &e, &p, &r, &errors);
+	timelib_strtointerval(ZSTR_VAL(format), ZSTR_LEN(format), &b, &e, &p, &r, &errors);
 
 	if (errors->error_count > 0) {
-		zend_throw_exception_ex(date_ce_date_malformed_interval_string_exception, 0, "Unknown or bad format (%s)", format);
+		zend_throw_exception_ex(date_ce_date_malformed_interval_string_exception, 0, "Unknown or bad format (%pS)", format);
 		retval = false;
 		if (p) {
 			timelib_rel_time_dtor(p);
@@ -4478,7 +4480,7 @@ static bool date_interval_initialize(timelib_rel_time **rt, const char *format,
 				*rt = timelib_diff(b, e);
 				retval = true;
 			} else {
-				zend_throw_exception_ex(date_ce_date_malformed_interval_string_exception, 0, "Failed to parse interval (%s)", format);
+				zend_throw_exception_ex(date_ce_date_malformed_interval_string_exception, 0, "Failed to parse interval (%pS)", format);
 				retval = false;
 			}
 		}
@@ -4624,10 +4626,10 @@ PHP_METHOD(DateInterval, __construct)
 	timelib_rel_time *reltime;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(interval_string)
+		Z_PARAM_PATH_STR(interval_string)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!date_interval_initialize(&reltime, ZSTR_VAL(interval_string), ZSTR_LEN(interval_string))) {
+	if (!date_interval_initialize(&reltime, interval_string)) {
 		RETURN_THROWS();
 	}
 
@@ -4649,9 +4651,15 @@ static void php_date_interval_initialize_from_hash(php_interval_obj *intobj, con
 		time = timelib_strtotime(Z_STRVAL_P(date_str), Z_STRLEN_P(date_str), &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 
 		if (err->error_count > 0)  {
+			const zend_string *date_string;
+			if (Z_TYPE_P(date_str) == IS_STRING) {
+				date_string = Z_STR_P(date_str);
+			} else {
+				date_string = ZSTR_EMPTY_ALLOC();
+			}
 			zend_throw_error(NULL,
-				"Unknown or bad format (%s) at position %d (%c) while unserializing: %s",
-				Z_STRVAL_P(date_str),
+				"Unknown or bad format (%pS) at position %d (%c) while unserializing: %s",
+				date_string,
 				err->error_messages[0].position,
 				err->error_messages[0].character ? err->error_messages[0].character : ' ', err->error_messages[0].message);
 				timelib_time_dtor(time);
@@ -4891,20 +4899,20 @@ PHP_FUNCTION(date_interval_create_from_date_string)
 	timelib_error_container *err = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(time_str)
+		Z_PARAM_PATH_STR(time_str)
 	ZEND_PARSE_PARAMETERS_END();
 
 	time = timelib_strtotime(ZSTR_VAL(time_str), ZSTR_LEN(time_str), &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 
 	if (err->error_count > 0)  {
-		php_error_docref(NULL, E_WARNING, "Unknown or bad format (%s) at position %d (%c): %s", ZSTR_VAL(time_str),
+		php_error_docref(NULL, E_WARNING, "Unknown or bad format (%pS) at position %d (%c): %s", time_str,
 			err->error_messages[0].position, err->error_messages[0].character ? err->error_messages[0].character : ' ', err->error_messages[0].message);
 		RETVAL_FALSE;
 		goto cleanup;
 	}
 
 	if (time->have_date || time->have_time || time->have_zone) {
-		php_error_docref(NULL, E_WARNING, "String '%s' contains non-relative elements", ZSTR_VAL(time_str));
+		php_error_docref(NULL, E_WARNING, "String '%pS' contains non-relative elements", time_str);
 		RETVAL_FALSE;
 		goto cleanup;
 	}
@@ -4925,13 +4933,13 @@ PHP_METHOD(DateInterval, createFromDateString)
 	timelib_error_container *err = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STR(time_str)
+		Z_PARAM_PATH_STR(time_str)
 	ZEND_PARSE_PARAMETERS_END();
 
 	time = timelib_strtotime(ZSTR_VAL(time_str), ZSTR_LEN(time_str), &err, DATE_TIMEZONEDB, php_date_parse_tzfile_wrapper);
 
 	if (err->error_count > 0)  {
-		zend_throw_error(date_ce_date_malformed_interval_string_exception, "Unknown or bad format (%s) at position %d (%c): %s", ZSTR_VAL(time_str),
+		zend_throw_error(date_ce_date_malformed_interval_string_exception, "Unknown or bad format (%pS) at position %d (%c): %s", time_str,
 			err->error_messages[0].position, err->error_messages[0].character ? err->error_messages[0].character : ' ', err->error_messages[0].message);
 		goto cleanup;
 	}
@@ -5037,7 +5045,7 @@ PHP_FUNCTION(date_interval_format)
 }
 /* }}} */
 
-static bool date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, zend_long *recurrences, const char *format, size_t format_length) /* {{{ */
+static bool date_period_initialize(timelib_time **st, timelib_time **et, timelib_rel_time **d, zend_long *recurrences, const zend_string *format) /* {{{ */
 {
 	timelib_time     *b = NULL, *e = NULL;
 	timelib_rel_time *p = NULL;
@@ -5045,11 +5053,11 @@ static bool date_period_initialize(timelib_time **st, timelib_time **et, timelib
 	timelib_error_container *errors;
 	bool              retval = false;
 
-	timelib_strtointerval(format, format_length, &b, &e, &p, &r, &errors);
+	timelib_strtointerval(ZSTR_VAL(format), ZSTR_LEN(format), &b, &e, &p, &r, &errors);
 
 	if (errors->error_count > 0) {
 		retval = false;
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "Unknown or bad format (%s)", format);
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "Unknown or bad format(%pS)", format);
 		if (b) {
 			timelib_time_dtor(b);
 		}
@@ -5070,27 +5078,27 @@ static bool date_period_initialize(timelib_time **st, timelib_time **et, timelib
 	return retval;
 } /* }}} */
 
-static bool date_period_init_iso8601_string(php_period_obj *dpobj, zend_class_entry* base_ce, const char *isostr, size_t isostr_len, zend_long *recurrences)
+static bool date_period_init_iso8601_string(php_period_obj *dpobj, zend_class_entry* base_ce, const zend_string *isostr, zend_long *recurrences)
 {
-	if (!date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), recurrences, isostr, isostr_len)) {
+	if (!date_period_initialize(&(dpobj->start), &(dpobj->end), &(dpobj->interval), recurrences, isostr)) {
 		return false;
 	}
 
 	if (dpobj->start == NULL) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain a start date, \"%s\" given", ZSTR_VAL(func), isostr);
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain a start date, \"%pS\" given", ZSTR_VAL(func), isostr);
 		zend_string_release(func);
 		return false;
 	}
 	if (dpobj->interval == NULL) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain an interval, \"%s\" given", ZSTR_VAL(func), isostr);
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain an interval, \"%pS\" given", ZSTR_VAL(func), isostr);
 		zend_string_release(func);
 		return false;
 	}
 	if (dpobj->end == NULL && *recurrences == 0) {
 		zend_string *func = get_active_function_or_method_name();
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain an end date or a recurrence count, \"%s\" given", ZSTR_VAL(func), isostr);
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "%s(): ISO interval must contain an end date or a recurrence count, \"%pS\" given", ZSTR_VAL(func), isostr);
 		zend_string_release(func);
 		return false;
 	}
@@ -5142,11 +5150,10 @@ PHP_METHOD(DatePeriod, createFromISO8601String)
 {
 	php_period_obj *dpobj;
 	zend_long recurrences = 0, options = 0;
-	char *isostr = NULL;
-	size_t isostr_len = 0;
+	zend_string *isostr = NULL;
 
 	ZEND_PARSE_PARAMETERS_START(1, 2)
-		Z_PARAM_STRING(isostr, isostr_len)
+		Z_PARAM_PATH_STR(isostr)
 		Z_PARAM_OPTIONAL
 		Z_PARAM_LONG(options)
 	ZEND_PARSE_PARAMETERS_END();
@@ -5158,7 +5165,7 @@ PHP_METHOD(DatePeriod, createFromISO8601String)
 
 	dpobj->current = NULL;
 
-	if (!date_period_init_iso8601_string(dpobj, date_ce_immutable, isostr, isostr_len, &recurrences)) {
+	if (!date_period_init_iso8601_string(dpobj, date_ce_immutable, isostr, &recurrences)) {
 		RETURN_THROWS();
 	}
 
@@ -5191,13 +5198,12 @@ PHP_METHOD(DatePeriod, __construct)
 	php_date_obj     *dateobj;
 	zval *start, *end = NULL, *interval;
 	zend_long  recurrences = 0, options = 0;
-	char *isostr = NULL;
-	size_t   isostr_len = 0;
+	zend_string *isostr = NULL;
 	timelib_time *clone;
 
 	if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOl|l", &start, date_ce_interface, &interval, date_ce_interval, &recurrences, &options) == FAILURE) {
 		if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "OOO|l", &start, date_ce_interface, &interval, date_ce_interval, &end, date_ce_interface, &options) == FAILURE) {
-			if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "s|l", &isostr, &isostr_len, &options) == FAILURE) {
+			if (zend_parse_parameters_ex(ZEND_PARSE_PARAMS_QUIET, ZEND_NUM_ARGS(), "S|l", &isostr, &options) == FAILURE) {
 				zend_type_error("DatePeriod::__construct() accepts (DateTimeInterface, DateInterval, int [, int]), or (DateTimeInterface, DateInterval, DateTime [, int]), or (string [, int]) as arguments");
 				RETURN_THROWS();
 			}
@@ -5214,7 +5220,7 @@ PHP_METHOD(DatePeriod, __construct)
 			RETURN_THROWS();
 		}
 
-		if (!date_period_init_iso8601_string(dpobj, date_ce_date, isostr, isostr_len, &recurrences)) {
+		if (!date_period_init_iso8601_string(dpobj, date_ce_date, isostr, &recurrences)) {
 			RETURN_THROWS();
 		}
 	} else {
@@ -5458,22 +5464,21 @@ PHP_FUNCTION(timezone_abbreviations_list)
 /* {{{ Sets the default timezone used by all date/time functions in a script */
 PHP_FUNCTION(date_default_timezone_set)
 {
-	char *zone;
-	size_t   zone_len;
+	zend_string *zone;
 
 	ZEND_PARSE_PARAMETERS_START(1, 1)
-		Z_PARAM_STRING(zone, zone_len)
+		Z_PARAM_PATH_STR(zone)
 	ZEND_PARSE_PARAMETERS_END();
 
-	if (!timelib_timezone_id_is_valid(zone, DATE_TIMEZONEDB)) {
-		php_error_docref(NULL, E_NOTICE, "Timezone ID '%s' is invalid", zone);
+	if (!timelib_timezone_id_is_valid(ZSTR_VAL(zone), DATE_TIMEZONEDB)) {
+		php_error_docref(NULL, E_NOTICE, "Timezone ID '%pS' is invalid", zone);
 		RETURN_FALSE;
 	}
 	if (DATEG(timezone)) {
 		efree(DATEG(timezone));
 		DATEG(timezone) = NULL;
 	}
-	DATEG(timezone) = estrndup(zone, zone_len);
+	DATEG(timezone) = estrndup(ZSTR_VAL(zone), ZSTR_LEN(zone));
 	RETURN_TRUE;
 }
 /* }}} */
diff --git a/ext/date/php_date.h b/ext/date/php_date.h
index 97a49974f1a4..d409d9e7ae18 100644
--- a/ext/date/php_date.h
+++ b/ext/date/php_date.h
@@ -152,7 +152,7 @@ PHPAPI zend_class_entry *php_date_get_period_ce(void);
 #define PHP_DATE_INIT_FORMAT 0x02
 
 PHPAPI zval *php_date_instantiate(zend_class_entry *pce, zval *object);
-PHPAPI bool php_date_initialize(php_date_obj *dateobj, const char *time_str, size_t time_str_len, const char *format, zval *timezone_object, int flags);
+PHPAPI bool php_date_initialize(php_date_obj *dateobj, const zend_string *time_str, const char *format, zval *timezone_object, int flags);
 PHPAPI void php_date_initialize_from_ts_long(php_date_obj *dateobj, zend_long sec, int usec);
 PHPAPI bool php_date_initialize_from_ts_double(php_date_obj *dateobj, double ts);
 
diff --git a/ext/date/tests/.DS_Store b/ext/date/tests/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..81c50f5c71bc7dcb29aee898dac980f8be7b851f
GIT binary patch
literal 77828
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
INAv&x0Vn(HM*si-

literal 0
HcmV?d00001

diff --git a/ext/date/tests/22993/dateInterval_create_null_byte.phpt b/ext/date/tests/22993/dateInterval_create_null_byte.phpt
new file mode 100644
index 000000000000..61eaf014a44a
--- /dev/null
+++ b/ext/date/tests/22993/dateInterval_create_null_byte.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: DateInterval::createFromDateString() rejects embedded NUL byte
+--FILE--
+<?php
+
+DateInterval::createFromDateString("foo\0bar");
+
+?>
+--EXPECTF--
+Fatal error: Uncaught ValueError: DateInterval::createFromDateString(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
+Stack trace:
+#0 %s(%d): DateInterval::createFromDateString('foo\x00bar')
+#1 {main}
+  thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/date/tests/22993/dateInterval_nul_byte.phpt b/ext/date/tests/22993/dateInterval_nul_byte.phpt
new file mode 100644
index 000000000000..64e622eb4c5e
--- /dev/null
+++ b/ext/date/tests/22993/dateInterval_nul_byte.phpt
@@ -0,0 +1,18 @@
+--TEST--
+GH-22993: DateInterval error message with embedded NUL byte
+--FILE--
+<?php
+
+try {
+    new DateInterval("foo\0bar");
+} catch (DateMalformedIntervalStringException $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+Fatal error: Uncaught ValueError: DateInterval::__construct(): Argument #1 ($duration) must not contain any null bytes in %s:%d
+Stack trace:
+#0 %s(%d): DateInterval->__construct('foo\x00bar')
+#1 {main}
+  thrown in %s on line %d
diff --git a/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt b/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
new file mode 100644
index 000000000000..c4bb09cd4e7f
--- /dev/null
+++ b/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: DateInterval unserialize() error message with embedded NUL byte
+--FILE--
+<?php
+
+try {
+    unserialize('O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:7:"foo' . "\0" . 'bar";}');
+} catch (Error $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECTF--
+Unknown or bad format (foo%0bar) at position 0 (f) while unserializing: The timezone could not be found in the database
diff --git a/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt b/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
new file mode 100644
index 000000000000..5c41a3f4e37d
--- /dev/null
+++ b/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: DatePeriod::createFromISO8601String() rejects embedded NUL byte
+--FILE--
+<?php
+
+try {
+    DatePeriod::createFromISO8601String("foo\0bar");
+} catch (ValueError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+DatePeriod::createFromISO8601String(): Argument #1 ($specification) must not contain any null bytes
\ No newline at end of file
diff --git a/ext/date/tests/22993/dateTime_modify_embedded_null.phpt b/ext/date/tests/22993/dateTime_modify_embedded_null.phpt
new file mode 100644
index 000000000000..900fa4937ddc
--- /dev/null
+++ b/ext/date/tests/22993/dateTime_modify_embedded_null.phpt
@@ -0,0 +1,16 @@
+--TEST--
+GH-22993: DateTime::modify() error message with embedded NUL byte
+--FILE--
+<?php
+
+$now = new DateTime();
+
+try {
+    $now->modify("foo\0bar");
+} catch (DateMalformedStringException $e) {
+    echo $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+DateTime::modify(): Failed to parse time string (foo%0bar) at position %s
diff --git a/ext/date/tests/22993/date_interval_null_byte.phpt b/ext/date/tests/22993/date_interval_null_byte.phpt
new file mode 100644
index 000000000000..0d1e9f909a0e
--- /dev/null
+++ b/ext/date/tests/22993/date_interval_null_byte.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: date_interval_create_from_date_string() rejects embedded NUL byte
+--FILE--
+<?php
+
+date_interval_create_from_date_string("foo\0bar");
+
+?>
+--EXPECTF--
+Fatal error: Uncaught ValueError: date_interval_create_from_date_string(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
+Stack trace:
+#0 %s(%d): date_interval_create_from_date_string('foo\x00bar')
+#1 {main}
+  thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/date/tests/22993/ini_date_timezone_null_byte.phpt b/ext/date/tests/22993/ini_date_timezone_null_byte.phpt
new file mode 100644
index 000000000000..0d98638b190c
--- /dev/null
+++ b/ext/date/tests/22993/ini_date_timezone_null_byte.phpt
@@ -0,0 +1,10 @@
+--TEST--
+GH-22993: ini_set() with embedded NUL byte in date.timezone
+--FILE--
+<?php
+
+ini_set("date.timezone", "foo\0bar");
+
+?>
+--EXPECTF--
+Warning: ini_set(): Invalid date.timezone value 'foo%0bar', using 'UTC' instead in %s on line %d
diff --git a/ext/date/tests/22993/nul-byte-error-message.phpt b/ext/date/tests/22993/nul-byte-error-message.phpt
new file mode 100644
index 000000000000..b7c178955cf8
--- /dev/null
+++ b/ext/date/tests/22993/nul-byte-error-message.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: DateTimeImmutable rejects embedded NUL byte
+--FILE--
+<?php
+
+new DateTimeImmutable("foo\0bar");
+
+?>
+--EXPECTF--
+Fatal error: Uncaught ValueError: DateTimeImmutable::__construct(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
+Stack trace:
+#0 %s(%d): DateTimeImmutable->__construct('foo\x00bar')
+#1 {main}
+  thrown in %s on line %d
\ No newline at end of file
diff --git a/ext/date/tests/22993/timezone_set_null_byte.phpt b/ext/date/tests/22993/timezone_set_null_byte.phpt
new file mode 100644
index 000000000000..41bd5dd620b0
--- /dev/null
+++ b/ext/date/tests/22993/timezone_set_null_byte.phpt
@@ -0,0 +1,14 @@
+--TEST--
+GH-22993: date_default_timezone_set() rejects embedded NUL byte
+--FILE--
+<?php
+
+try {
+    date_default_timezone_set("foo\0bar");
+} catch (ValueError $e) {
+    echo $e->getMessage(), PHP_EOL;
+}
+
+?>
+--EXPECT--
+date_default_timezone_set(): Argument #1 ($timezoneId) must not contain any null bytes
\ No newline at end of file

From 2e90eee0e31752bcdb54304fea17a9f62639b3f9 Mon Sep 17 00:00:00 2001
From: arshidkv12 <arshidkv12@gmail.com>
Date: Wed, 19 Aug 2026 13:31:35 +0530
Subject: [PATCH 2/6] Fix date error messages for embedded NUL bytes

---
 ext/date/php_date.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ext/date/php_date.c b/ext/date/php_date.c
index e390ccae2c59..97b0b5a75a5b 100644
--- a/ext/date/php_date.c
+++ b/ext/date/php_date.c
@@ -5057,7 +5057,7 @@ static bool date_period_initialize(timelib_time **st, timelib_time **et, timelib
 
 	if (errors->error_count > 0) {
 		retval = false;
-		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "Unknown or bad format(%pS)", format);
+		zend_throw_exception_ex(date_ce_date_malformed_period_string_exception, 0, "Unknown or bad format (%pS)", format);
 		if (b) {
 			timelib_time_dtor(b);
 		}

From 396c168c5a0a81420bf766044da28379b5d7d991 Mon Sep 17 00:00:00 2001
From: arshidkv12 <arshidkv12@gmail.com>
Date: Wed, 19 Aug 2026 13:32:40 +0530
Subject: [PATCH 3/6] Fix date error messages for embedded NUL bytes

---
 ext/date/.DS_Store       | Bin 10244 -> 0 bytes
 ext/date/tests/.DS_Store | Bin 77828 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 ext/date/.DS_Store
 delete mode 100644 ext/date/tests/.DS_Store

diff --git a/ext/date/.DS_Store b/ext/date/.DS_Store
deleted file mode 100644
index 6f6fc404c8d4e1fd72d983869dd1ab026a8d35ca..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10244
zcmeHM%~BIV5bg;e%df%G(u0RBy?B5a$RCuKRDc6lLg_)Rm?Z(WTy|6WF$W4OXTA9V
zK7=Qq#MjZUXBM(My96z&ETv|s+1|{|*E9Wf&xD>3k*Ez?>qIsYS*R?ti+H3I?&q2)
znXtu%6u=X?bWAxKQh_!SqfLWhz%XDKFbo(53<LiH1NhG7Vl60Xo`wO#fMMX00X`pW
zRF>6Hj+B%~2Ocs7fSg9NEO<vAATf3*tDzhzDWTA*vIh}DMVMj;1xLTl!y&7o94V>b
zBov%PII{>d6d`8^&X&VTRFyPO!+>ER$$*Wfc{-$kd^(Ee?|WWw=y-vHe%?|w)Z9;5
z@TOz($ofyIsA0Zom|5DUecGiR+M@%i$484N+UP0rupUPn^+g-?kUDgN+MpISsZVWM
zqjf6b{=tFVLR%Ya3sC!5VJEIF)BP=NO{zfOCjLrPyrDMMqiPv^-*jyySXq`Dx1g21
za1%=%*m)@Jtbn&a(Kes(LXHlTT#MyM1TCguT3|%;k&L{r5nS3_C-J!$BR)nj3n_DX
z6vR<70<W7%!z3bTC1s`_Vs8LX<y2pM)=UO57@hTALPG=I=;CJ0m3x#utl2AdM0e+S
zSM-58mAj$<&+@%o8D2iZ-ncSWCNO@XE#Y0sc)EATm=x~{-p^6%$KD;|G;0axN-UDb
z-W_8S-j%3mOr*`Ec{jntj67l3pFPcse3C@%h>UcGy-s+Nes?;a+w14^KSX9~dgjio
zHES(cZ|f()u-<R>2fbRe`<g!;1cB#Vyf>YfZhP3s-ro-Ve$(~aT?ueoZ47zy%Jo~p
zuoevbR!?H<s>7PI<{H^YXJ;Fg(yCq9temgfXImTjRl8UypP$cJ51u}MvEO*_o%+Ei
ztR6*#|6I|M`h5BPjJJqIAL?D-3;bh-pe}(A6=gZPHr8XFTfRhI8{@n?W7x+LYzzCV
zE6;ydev_@?y^Lr-!g*H2NmiN=?TDtB=k89>n}~ak-`J{FCZf}J0NWLf%j`rAiMW<4
zh~g)&UypFzdXQm?VZbn87%&VN1`GqYn1Lx}o6YzCyI24Ie~TF~rWpnd17doozJn_h
znarip!B-SE>N`{}ob-*9lo=x)JcQfjbv!=sb^NoiEzgn*`m3QFDJkJ-mvBgRoBvmS
Z3^4h>$^ZFgThD+e=g-=$=Kq`j{{mW~*S`P&

diff --git a/ext/date/tests/.DS_Store b/ext/date/tests/.DS_Store
deleted file mode 100644
index 81c50f5c71bc7dcb29aee898dac980f8be7b851f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77828
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
INAv&x0Vn(HM*si-


From 2781f1b3a23529fe2d32e7033b97df02968314cc Mon Sep 17 00:00:00 2001
From: Arshid <arshidkv12@gmail.com>
Date: Thu, 20 Aug 2026 09:58:19 +0530
Subject: [PATCH 4/6] Update
 ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>
---
 .../tests/22993/dateInterval_unserialize_null_byte.phpt     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt b/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
index c4bb09cd4e7f..68d8a691b835 100644
--- a/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
+++ b/ext/date/tests/22993/dateInterval_unserialize_null_byte.phpt
@@ -5,10 +5,10 @@ GH-22993: DateInterval unserialize() error message with embedded NUL byte
 
 try {
     unserialize('O:12:"DateInterval":2:{s:11:"from_string";b:1;s:11:"date_string";s:7:"foo' . "\0" . 'bar";}');
-} catch (Error $e) {
-    echo $e->getMessage(), PHP_EOL;
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
-Unknown or bad format (foo%0bar) at position 0 (f) while unserializing: The timezone could not be found in the database
+Error: Unknown or bad format (foo%0bar) at position 0 (f) while unserializing: The timezone could not be found in the database

From 885ec7ff9431d1b3686bf488dc32dc19ef210286 Mon Sep 17 00:00:00 2001
From: Arshid <arshidkv12@gmail.com>
Date: Thu, 20 Aug 2026 09:58:28 +0530
Subject: [PATCH 5/6] Update
 ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/dateTime_modify_embedded_null.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/dateInterval_create_null_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/timezone_set_null_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/nul-byte-error-message.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/dateInterval_nul_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>

Update ext/date/tests/22993/date_interval_null_byte.phpt

Co-authored-by: NickSdot <32384907+NickSdot@users.noreply.github.com>
---
 .../tests/22993/dateInterval_create_null_byte.phpt | 12 ++++++------
 ext/date/tests/22993/dateInterval_nul_byte.phpt    |  8 +++++++-
 .../22993/datePeriod_create_iso8601_null_byte.phpt |  6 +++---
 .../tests/22993/dateTime_modify_embedded_null.phpt |  6 +++---
 ext/date/tests/22993/date_interval_null_byte.phpt  | 12 ++++++------
 ext/date/tests/22993/nul-byte-error-message.phpt   | 14 +++++++-------
 ext/date/tests/22993/timezone_set_null_byte.phpt   |  6 +++---
 7 files changed, 35 insertions(+), 29 deletions(-)

diff --git a/ext/date/tests/22993/dateInterval_create_null_byte.phpt b/ext/date/tests/22993/dateInterval_create_null_byte.phpt
index 61eaf014a44a..844f52f546ab 100644
--- a/ext/date/tests/22993/dateInterval_create_null_byte.phpt
+++ b/ext/date/tests/22993/dateInterval_create_null_byte.phpt
@@ -3,12 +3,12 @@ GH-22993: DateInterval::createFromDateString() rejects embedded NUL byte
 --FILE--
 <?php
 
-DateInterval::createFromDateString("foo\0bar");
+try {
+    DateInterval::createFromDateString("foo\0bar");
+} catch(Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: DateInterval::createFromDateString(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
-Stack trace:
-#0 %s(%d): DateInterval::createFromDateString('foo\x00bar')
-#1 {main}
-  thrown in %s on line %d
\ No newline at end of file
+ValueError: DateInterval::createFromDateString(): Argument #1 ($datetime) must not contain any null bytes
diff --git a/ext/date/tests/22993/dateInterval_nul_byte.phpt b/ext/date/tests/22993/dateInterval_nul_byte.phpt
index 64e622eb4c5e..50c12f00a0db 100644
--- a/ext/date/tests/22993/dateInterval_nul_byte.phpt
+++ b/ext/date/tests/22993/dateInterval_nul_byte.phpt
@@ -15,4 +15,10 @@ Fatal error: Uncaught ValueError: DateInterval::__construct(): Argument #1 ($dur
 Stack trace:
 #0 %s(%d): DateInterval->__construct('foo\x00bar')
 #1 {main}
-  thrown in %s on line %d
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
+
+?>
+--EXPECTF--
+ValueError: DateInterval::__construct(): Argument #1 ($duration) must not contain any null bytes
diff --git a/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt b/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
index 5c41a3f4e37d..7659146a1fea 100644
--- a/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
+++ b/ext/date/tests/22993/datePeriod_create_iso8601_null_byte.phpt
@@ -5,10 +5,10 @@ GH-22993: DatePeriod::createFromISO8601String() rejects embedded NUL byte
 
 try {
     DatePeriod::createFromISO8601String("foo\0bar");
-} catch (ValueError $e) {
-    echo $e->getMessage(), PHP_EOL;
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-DatePeriod::createFromISO8601String(): Argument #1 ($specification) must not contain any null bytes
\ No newline at end of file
+ValueError: DatePeriod::createFromISO8601String(): Argument #1 ($specification) must not contain any null bytes
diff --git a/ext/date/tests/22993/dateTime_modify_embedded_null.phpt b/ext/date/tests/22993/dateTime_modify_embedded_null.phpt
index 900fa4937ddc..68177303456e 100644
--- a/ext/date/tests/22993/dateTime_modify_embedded_null.phpt
+++ b/ext/date/tests/22993/dateTime_modify_embedded_null.phpt
@@ -7,10 +7,10 @@ $now = new DateTime();
 
 try {
     $now->modify("foo\0bar");
-} catch (DateMalformedStringException $e) {
-    echo $e->getMessage(), "\n";
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECTF--
-DateTime::modify(): Failed to parse time string (foo%0bar) at position %s
+DateMalformedStringException: DateTime::modify(): Failed to parse time string (foo%0bar) at position %s
diff --git a/ext/date/tests/22993/date_interval_null_byte.phpt b/ext/date/tests/22993/date_interval_null_byte.phpt
index 0d1e9f909a0e..a9622b985985 100644
--- a/ext/date/tests/22993/date_interval_null_byte.phpt
+++ b/ext/date/tests/22993/date_interval_null_byte.phpt
@@ -3,12 +3,12 @@ GH-22993: date_interval_create_from_date_string() rejects embedded NUL byte
 --FILE--
 <?php
 
-date_interval_create_from_date_string("foo\0bar");
+try {
+    date_interval_create_from_date_string("foo\0bar");
+} catch(Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
 
 ?>
 --EXPECTF--
-Fatal error: Uncaught ValueError: date_interval_create_from_date_string(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
-Stack trace:
-#0 %s(%d): date_interval_create_from_date_string('foo\x00bar')
-#1 {main}
-  thrown in %s on line %d
\ No newline at end of file
+ValueError: date_interval_create_from_date_string(): Argument #1 ($datetime) must not contain any null bytes
diff --git a/ext/date/tests/22993/nul-byte-error-message.phpt b/ext/date/tests/22993/nul-byte-error-message.phpt
index b7c178955cf8..45f2f0d26f57 100644
--- a/ext/date/tests/22993/nul-byte-error-message.phpt
+++ b/ext/date/tests/22993/nul-byte-error-message.phpt
@@ -3,12 +3,12 @@ GH-22993: DateTimeImmutable rejects embedded NUL byte
 --FILE--
 <?php
 
-new DateTimeImmutable("foo\0bar");
+try {
+    new DateTimeImmutable("foo\0bar");
+} catch(Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
+}
 
 ?>
---EXPECTF--
-Fatal error: Uncaught ValueError: DateTimeImmutable::__construct(): Argument #1 ($datetime) must not contain any null bytes in %s:%d
-Stack trace:
-#0 %s(%d): DateTimeImmutable->__construct('foo\x00bar')
-#1 {main}
-  thrown in %s on line %d
\ No newline at end of file
+--EXPECT--
+ValueError: DateTimeImmutable::__construct(): Argument #1 ($datetime) must not contain any null bytes
diff --git a/ext/date/tests/22993/timezone_set_null_byte.phpt b/ext/date/tests/22993/timezone_set_null_byte.phpt
index 41bd5dd620b0..37328f597a7a 100644
--- a/ext/date/tests/22993/timezone_set_null_byte.phpt
+++ b/ext/date/tests/22993/timezone_set_null_byte.phpt
@@ -5,10 +5,10 @@ GH-22993: date_default_timezone_set() rejects embedded NUL byte
 
 try {
     date_default_timezone_set("foo\0bar");
-} catch (ValueError $e) {
-    echo $e->getMessage(), PHP_EOL;
+} catch (Throwable $e) {
+    echo $e::class, ': ', $e->getMessage(), "\n";
 }
 
 ?>
 --EXPECT--
-date_default_timezone_set(): Argument #1 ($timezoneId) must not contain any null bytes
\ No newline at end of file
+ValueError: date_default_timezone_set(): Argument #1 ($timezoneId) must not contain any null bytes

From 1b98c659bd15c4892ec8aedc2a63de2266f40466 Mon Sep 17 00:00:00 2001
From: arshidkv12 <arshidkv12@gmail.com>
Date: Thu, 20 Aug 2026 10:13:27 +0530
Subject: [PATCH 6/6] Fix date error messages for embedded NUL bytes

---
 ext/date/tests/22993/dateInterval_nul_byte.phpt | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/ext/date/tests/22993/dateInterval_nul_byte.phpt b/ext/date/tests/22993/dateInterval_nul_byte.phpt
index 50c12f00a0db..07d8ffb1ab02 100644
--- a/ext/date/tests/22993/dateInterval_nul_byte.phpt
+++ b/ext/date/tests/22993/dateInterval_nul_byte.phpt
@@ -5,16 +5,6 @@ GH-22993: DateInterval error message with embedded NUL byte
 
 try {
     new DateInterval("foo\0bar");
-} catch (DateMalformedIntervalStringException $e) {
-    echo $e->getMessage(), PHP_EOL;
-}
-
-?>
---EXPECTF--
-Fatal error: Uncaught ValueError: DateInterval::__construct(): Argument #1 ($duration) must not contain any null bytes in %s:%d
-Stack trace:
-#0 %s(%d): DateInterval->__construct('foo\x00bar')
-#1 {main}
 } catch (Throwable $e) {
     echo $e::class, ': ', $e->getMessage(), "\n";
 }