luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-07 14:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged from trunk:

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

	Merged from trunk:

	* 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=/branches/glib-2-14/; revision=6161
This commit is contained in:
Emmanuele Bassi
2007-12-19 17:38:58 +00:00
committed by Emmanuele Bassi
parent 8b57c219d0
commit e3e92b4d3f
3 changed files with 15 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@@ -1,3 +1,13 @@
2007-12-19 Emmanuele Bassi <ebassi@gnome.org>
Merged from trunk:
* 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-13 Bastien Nocera <hadess@hadess.net> 2007-12-13 Bastien Nocera <hadess@hadess.net>
* glib/gtimer.c: (g_time_val_from_iso8601): * glib/gtimer.c: (g_time_val_from_iso8601):

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

@@ -1186,6 +1186,7 @@ main (int argc,
g_timer_destroy(timer); g_timer_destroy(timer);
g_timer_destroy(timer2); g_timer_destroy(timer2);
#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"
@@ -1194,6 +1195,7 @@ main (int argc,
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);
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);
g_assert (date.tv_sec == ref_date.tv_sec); g_assert (date.tv_sec == ref_date.tv_sec);