From: Tim-Philipp Müller Date: Sun, 15 Jan 2017 11:52:44 +0000 (+0000) Subject: datetime: fix potential out-of-bound read on malformed datetime string X-Git-Tag: 1.10.4~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9398b7f1a75b38844ae7050b5a7967e4cdebe24f;p=platform%2Fupstream%2Fgstreamer.git datetime: fix potential out-of-bound read on malformed datetime string https://bugzilla.gnome.org/show_bug.cgi?id=777263 --- diff --git a/gst/gstdatetime.c b/gst/gstdatetime.c index 2d99594955..67cdd6cf2a 100644 --- a/gst/gstdatetime.c +++ b/gst/gstdatetime.c @@ -865,7 +865,7 @@ gst_date_time_new_from_iso8601_string (const gchar * string) else if (neg_pos) pos = neg_pos + 1; - if (pos) { + if (pos && strlen (pos) >= 3) { gint ret_tz; if (pos[2] == ':') ret_tz = sscanf (pos, "%d:%d", &gmt_offset_hour, &gmt_offset_min); diff --git a/tests/check/gst/gstdatetime.c b/tests/check/gst/gstdatetime.c index ae15dc55bc..7bbc5bd41d 100644 --- a/tests/check/gst/gstdatetime.c +++ b/tests/check/gst/gstdatetime.c @@ -701,6 +701,14 @@ GST_START_TEST (test_GstDateTime_iso8601) fail_unless (!gst_date_time_has_second (dt)); gst_date_time_unref (dt); + /* some bogus ones, make copy to detect out of bound read in valgrind/asan */ + { + gchar *s = g_strdup ("0002000000T00000:00+0"); + dt = gst_date_time_new_from_iso8601_string (s); + gst_date_time_unref (dt); + g_free (s); + } + g_date_time_unref (gdt2); }