diff options
author | Carlo Lobrano <c.lobrano@gmail.com> | 2022-04-08 11:46:11 +0200 |
---|---|---|
committer | Carlo Lobrano <c.lobrano@gmail.com> | 2022-04-08 15:41:49 +0200 |
commit | ac243f94676695d88e861d225e98ec5bb3c2861e (patch) | |
tree | 339f80e309a17e17e707d0716f2bf4e070fae2c1 /src/mm-modem-helpers.c | |
parent | 5c8c1136bd3bad2b542a0b3dc334dbd0686ba10d (diff) | |
download | ModemManager-ac243f94676695d88e861d225e98ec5bb3c2861e.tar.gz |
sms: prevent crash if date is out of range
g_date_time_new, and g_date_time_new_utc return NULL if inputs are out
of range, and currently mm_new_iso8601_time passes the GDateTime created
by those two functions to date_time_format_iso8601 without checking for
NULL values, causing a g_date_time_format_iso8601 crash if PDU data is
corrupted with wrong date.
To prevent this, mm_new_iso8601_time now can return NULL and set a new
GError if GDateTime created by g_date_time_new is NULL.
Fixes #546
Diffstat (limited to 'src/mm-modem-helpers.c')
-rw-r--r-- | src/mm-modem-helpers.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mm-modem-helpers.c b/src/mm-modem-helpers.c index 72714ab9a..5e58ba9dd 100644 --- a/src/mm-modem-helpers.c +++ b/src/mm-modem-helpers.c @@ -5112,15 +5112,17 @@ mm_parse_cclk_response (const char *response, mm_network_timezone_set_offset (*tzp, tz * 15); } + ret = TRUE; + if (iso8601p) { /* Return ISO-8601 format date/time string */ *iso8601p = mm_new_iso8601_time (year, month, day, hour, minute, second, - TRUE, (tz * 15)); + TRUE, (tz * 15), + error); + ret = (*iso8601p != NULL); } - ret = TRUE; - out: g_match_info_free (match_info); g_regex_unref (r); |