Merge remote-tracking branch 'nielsdos/fix-php-gh-17159' into v2022

derickr · derickr · commit d611da5a300d · 2025-05-27T09:20:08.000+01:00
diff --git a/parse_date.re b/parse_date.re
@@ -939,10 +939,12 @@ timelib_long timelib_parse_zone(const char **ptr, int *dst, timelib_time *t, int
 {
 	timelib_tzinfo *res;
 	timelib_long            retval = 0;
+	size_t paren_count = 0;
 
 	*tz_not_found = 0;
 
 	while (**ptr == ' ' || **ptr == '\t' || **ptr == '(') {
+		paren_count += **ptr == '(';
 		++*ptr;
 	}
 	if ((*ptr)[0] == 'G' && (*ptr)[1] == 'M' && (*ptr)[2] == 'T' && ((*ptr)[3] == '+' || (*ptr)[3] == '-')) {
@@ -991,8 +993,9 @@ timelib_long timelib_parse_zone(const char **ptr, int *dst, timelib_time *t, int
 		*tz_not_found = (found == 0);
 		retval = offset;
 	}
-	while (**ptr == ')') {
+	while (paren_count > 0 && **ptr == ')') {
 		++*ptr;
+		paren_count--;
 	}
 	return retval;
 }
diff --git a/tests/c/parse_tz.cpp b/tests/c/parse_tz.cpp
@@ -136,3 +136,20 @@ TEST(parse_tz, etc_gmt_2)
 	timelib_tzinfo_dtor(t->tz_info);
 	timelib_time_dtor(t);
 }
+
+TEST(parse_tz, parentheses)
+{
+	timelib_time *t = timelib_time_ctor();
+	const char *tz_name = "((UTC)))";
+	int is_dst;
+	int tz_not_found;
+
+	timelib_parse_zone(&tz_name, &is_dst, t, &tz_not_found, timelib_builtin_db(), test_date_parse_tzfile);
+
+	CHECK(t->tz_info != NULL);
+	STRCMP_EQUAL(t->tz_info->name, "UTC");
+	BYTES_EQUAL(*tz_name, ')');
+
+	timelib_tzinfo_dtor(t->tz_info);
+	timelib_time_dtor(t);
+}

Original file line number	Diff line number	Diff line change
`@@ -939,10 +939,12 @@ timelib_long timelib_parse_zone(const char *ptr, int dst, timelib_time *t, int`
`939`	`939`	`{`
`940`	`940`	`timelib_tzinfo *res;`
`941`	`941`	`timelib_long retval = 0;`
	`942`	`+ size_t paren_count = 0;`
`942`	`943`
`943`	`944`	`*tz_not_found = 0;`
`944`	`945`
`945`	`946`	`while (ptr == ' ' \|\| ptr == '\t' \|\| **ptr == '(') {`
	`947`	`+ paren_count += **ptr == '(';`
`946`	`948`	`++*ptr;`
`947`	`949`	`}`
`948`	`950`	`if ((ptr)[0] == 'G' && (ptr)[1] == 'M' && (ptr)[2] == 'T' && ((ptr)[3] == '+' \|\| (*ptr)[3] == '-')) {`
`@@ -991,8 +993,9 @@ timelib_long timelib_parse_zone(const char *ptr, int dst, timelib_time *t, int`
`991`	`993`	`*tz_not_found = (found == 0);`
`992`	`994`	`retval = offset;`
`993`	`995`	`}`
`994`		`- while (**ptr == ')') {`
	`996`	`+ while (paren_count > 0 && **ptr == ')') {`
`995`	`997`	`++*ptr;`
	`998`	`+ paren_count--;`
`996`	`999`	`}`
`997`	`1000`	`return retval;`
`998`	`1001`	`}`