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

gtimer: Handle gmtime() failure in g_time_val_to_iso8601()

Browse Source 
g_time_val_to_iso8601() has a limit to the future dates it can convert,
imposed by what gmtime() can fit in its year field. If gmtime() fails,
gracefully return NULL from g_time_val_to_iso8601() rather than trying
to dereference the NULL structure and crashing.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

https://bugzilla.gnome.org/show_bug.cgi?id=782075
This commit is contained in:
Philip Withnall 2017-05-02 15:53:13 +01:00
parent 9374ecc3cb
commit f9a6a9ba53
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
glib/gtimer.c
View File

@ -491,7 +491,14 @@ g_time_val_from_iso8601 (const gchar *iso_date,
* Use g_date_time_format() or g_strdup_printf() if a different * Use g_date_time_format() or g_strdup_printf() if a different
* variation of ISO 8601 format is required. * variation of ISO 8601 format is required.
* *
* Returns: a newly allocated string containing an ISO 8601 date * If @time_ represents a date which is too large to fit into a `struct tm`,
* %NULL will be returned. This is platform dependent, but it is safe to assume
* years up to 3000 are supported. The return value of g_time_val_to_iso8601()
* has been nullable since GLib 2.54; before then, GLib would crash under the
* same conditions.
*
* Returns: (nullable): a newly allocated string containing an ISO 8601 date,
* or %NULL if @time_ was too large
* *
* Since: 2.12 * Since: 2.12
*/ */
@ -518,6 +525,10 @@ g_time_val_to_iso8601 (GTimeVal *time_)
#endif #endif
#endif #endif
/* If the gmtime() call has failed, time_->tv_sec is too big. */
if (tm == NULL)
return NULL;
if (time_->tv_usec != 0) if (time_->tv_usec != 0)
{ {
/* ISO 8601 date and time format, with fractionary seconds: /* ISO 8601 date and time format, with fractionary seconds: