luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix the date validation check. (#503029)

Browse Source 
2007-12-19  Emmanuele Bassi  <ebassi@gnome.org>

	* glib/gtimer.c (g_time_val_from_iso8601): Fix the date validation
	check. (#503029)

	* tests/testglib.c (various_string_tests): Add an invalid date
	for testing the above fix.

svn path=/trunk/; revision=6160
This commit is contained in:
Emmanuele Bassi 2007-12-19 17:28:38 +00:00 committed by Emmanuele Bassi
parent 28d1c8e0ad
commit a979c0d5a2
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2007-12-19 Emmanuele Bassi <ebassi@gnome.org>
* glib/gtimer.c (g_time_val_from_iso8601): Fix the date validation
check. (#503029)
* tests/testglib.c (various_string_tests): Add an invalid date
for testing the above fix.
2007-12-19 Alexander Larsson <alexl@redhat.com> 2007-12-19 Alexander Larsson <alexl@redhat.com>
* glib/gfileutils.[ch]: * glib/gfileutils.[ch]:

4
glib/gtimer.c
View File

@ -312,9 +312,11 @@ g_time_val_from_iso8601 (const gchar *iso_date,
* have an ISO 8601 date */ * have an ISO 8601 date */
while (g_ascii_isspace (*iso_date)) while (g_ascii_isspace (*iso_date))
iso_date++; iso_date++;
if (*iso_date == '\0') if (*iso_date == '\0')
return FALSE; return FALSE;
if (!g_ascii_isdigit (*iso_date) || iso_date != '-' || *iso_date != '+')
if (!g_ascii_isdigit (*iso_date) && *iso_date != '-' && *iso_date != '+')
return FALSE; return FALSE;
val = strtoul (iso_date, (char **)&iso_date, 10); val = strtoul (iso_date, (char **)&iso_date, 10);

2
tests/testglib.c
View File

@ -1382,6 +1382,7 @@ various_string_tests (void)
g_free (tmp_string); g_free (tmp_string);
g_free (string); g_free (string);
#define REF_INVALID "Wed Dec 19 17:20:20 GMT 2007"
#define REF_SEC_UTC 320063760 #define REF_SEC_UTC 320063760
#define REF_STR_UTC "1980-02-22T10:36:00Z" #define REF_STR_UTC "1980-02-22T10:36:00Z"
#define REF_STR_CEST "1980-02-22T12:36:00+02:00" #define REF_STR_CEST "1980-02-22T12:36:00+02:00"
@ -1391,6 +1392,7 @@ various_string_tests (void)
g_print ("checking g_time_val_from_iso8601...\n"); g_print ("checking g_time_val_from_iso8601...\n");
ref_date.tv_sec = REF_SEC_UTC; ref_date.tv_sec = REF_SEC_UTC;
ref_date.tv_usec = 0; ref_date.tv_usec = 0;
g_assert (g_time_val_from_iso8601 (REF_INVALID, &date) == FALSE);
g_assert (g_time_val_from_iso8601 (REF_STR_UTC, &date) != FALSE); g_assert (g_time_val_from_iso8601 (REF_STR_UTC, &date) != FALSE);
if (g_test_verbose()) if (g_test_verbose())
g_print ("\t=> UTC stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec); g_print ("\t=> UTC stamp = %ld (should be: %ld) (%ld off)\n", date.tv_sec, ref_date.tv_sec, date.tv_sec - ref_date.tv_sec);