98 lines
3.8 KiB
Diff
98 lines
3.8 KiB
Diff
Backport of https://gitlab.gnome.org/GNOME/libsoup/-/commit/8988379984e33dcc7d3aa58551db13e48755959f
|
|
|
|
diff -urp libsoup-3.4.4.orig/libsoup/soup-date-utils.c libsoup-3.4.4/libsoup/soup-date-utils.c
|
|
--- libsoup-3.4.4.orig/libsoup/soup-date-utils.c 2023-10-26 14:03:53.000000000 -0500
|
|
+++ libsoup-3.4.4/libsoup/soup-date-utils.c 2025-06-18 12:11:11.680027374 -0500
|
|
@@ -129,7 +129,7 @@ parse_day (int *day, const char **date_s
|
|
while (*end == ' ' || *end == '-')
|
|
end++;
|
|
*date_string = end;
|
|
- return TRUE;
|
|
+ return *day >= 1 && *day <= 31;
|
|
}
|
|
|
|
static inline gboolean
|
|
@@ -169,7 +169,7 @@ parse_year (int *year, const char **date
|
|
while (*end == ' ' || *end == '-')
|
|
end++;
|
|
*date_string = end;
|
|
- return TRUE;
|
|
+ return *year > 0 && *year < 9999;
|
|
}
|
|
|
|
static inline gboolean
|
|
@@ -193,7 +193,7 @@ parse_time (int *hour, int *minute, int
|
|
while (*p == ' ')
|
|
p++;
|
|
*date_string = p;
|
|
- return TRUE;
|
|
+ return *hour >= 0 && *hour < 24 && *minute >= 0 && *minute < 60 && *second >= 0 && *second < 60;
|
|
}
|
|
|
|
static inline gboolean
|
|
@@ -209,9 +209,14 @@ parse_timezone (GTimeZone **timezone, co
|
|
gulong val;
|
|
int sign = (**date_string == '+') ? 1 : -1;
|
|
val = strtoul (*date_string + 1, (char **)date_string, 10);
|
|
- if (**date_string == ':')
|
|
- val = 60 * val + strtoul (*date_string + 1, (char **)date_string, 10);
|
|
- else
|
|
+ if (val > 9999)
|
|
+ return FALSE;
|
|
+ if (**date_string == ':') {
|
|
+ gulong val2 = strtoul (*date_string + 1, (char **)date_string, 10);
|
|
+ if (val > 99 || val2 > 99)
|
|
+ return FALSE;
|
|
+ val = 60 * val + val2;
|
|
+ } else
|
|
val = 60 * (val / 100) + (val % 100);
|
|
offset_minutes = sign * val;
|
|
utc = (sign == -1) && !val;
|
|
@@ -264,7 +269,8 @@ parse_textual_date (const char *date_str
|
|
if (!parse_month (&month, &date_string) ||
|
|
!parse_day (&day, &date_string) ||
|
|
!parse_time (&hour, &minute, &second, &date_string) ||
|
|
- !parse_year (&year, &date_string))
|
|
+ !parse_year (&year, &date_string) ||
|
|
+ !g_date_valid_dmy (day, month, year))
|
|
return NULL;
|
|
|
|
/* There shouldn't be a timezone, but check anyway */
|
|
@@ -276,7 +282,8 @@ parse_textual_date (const char *date_str
|
|
if (!parse_day (&day, &date_string) ||
|
|
!parse_month (&month, &date_string) ||
|
|
!parse_year (&year, &date_string) ||
|
|
- !parse_time (&hour, &minute, &second, &date_string))
|
|
+ !parse_time (&hour, &minute, &second, &date_string) ||
|
|
+ !g_date_valid_dmy (day, month, year))
|
|
return NULL;
|
|
|
|
/* This time there *should* be a timezone, but we
|
|
diff -urp libsoup-3.4.4.orig/tests/cookies-test.c libsoup-3.4.4/tests/cookies-test.c
|
|
--- libsoup-3.4.4.orig/tests/cookies-test.c 2023-10-26 14:03:53.000000000 -0500
|
|
+++ libsoup-3.4.4/tests/cookies-test.c 2025-06-18 12:12:06.334277212 -0500
|
|
@@ -435,6 +435,15 @@ do_cookies_parsing_nopath_nullorigin (vo
|
|
}
|
|
|
|
static void
|
|
+do_cookies_parsing_int32_overflow (void)
|
|
+{
|
|
+ SoupCookie *cookie = soup_cookie_parse ("Age=1;expires=3Mar9 999:9:9+ 999999999-age=main=gne=", NULL);
|
|
+ g_assert_nonnull (cookie);
|
|
+ g_assert_null (soup_cookie_get_expires (cookie));
|
|
+ soup_cookie_free (cookie);
|
|
+}
|
|
+
|
|
+static void
|
|
do_cookies_equal_nullpath (void)
|
|
{
|
|
SoupCookie *cookie1, *cookie2;
|
|
@@ -655,6 +664,7 @@ main (int argc, char **argv)
|
|
g_test_add_func ("/cookies/accept-policy-subdomains", do_cookies_subdomain_policy_test);
|
|
g_test_add_func ("/cookies/parsing", do_cookies_parsing_test);
|
|
g_test_add_func ("/cookies/parsing/no-path-null-origin", do_cookies_parsing_nopath_nullorigin);
|
|
+ g_test_add_func ("/cookies/parsing/int32-overflow", do_cookies_parsing_int32_overflow);
|
|
g_test_add_func ("/cookies/parsing/equal-nullpath", do_cookies_equal_nullpath);
|
|
g_test_add_func ("/cookies/parsing/control-characters", do_cookies_parsing_control_characters);
|
|
g_test_add_func ("/cookies/get-cookies/empty-host", do_get_cookies_empty_host_test);
|