From 314efb684b97f3d3a66577cdca892532a7565cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sun, 25 Nov 2012 14:16:09 +0000 Subject: [PATCH] qtdemux: avoid criticals if unknown fourcc has space at beginning or end https://bugzilla.gnome.org/show_bug.cgi?id=682936 --- gst/isomp4/qtdemux.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gst/isomp4/qtdemux.c b/gst/isomp4/qtdemux.c index ffefc61f04..1e491a9124 100644 --- a/gst/isomp4/qtdemux.c +++ b/gst/isomp4/qtdemux.c @@ -9620,10 +9620,10 @@ qtdemux_video_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, case GST_MAKE_FOURCC ('k', 'p', 'c', 'd'): default: { - char *s; + char *s, fourstr[5]; - s = g_strdup_printf ("video/x-gst-fourcc-%" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (fourcc)); + g_snprintf (fourstr, 5, "%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); + s = g_strdup_printf ("video/x-gst-fourcc-%s", g_strstrip (fourstr)); caps = gst_caps_new_empty_simple (s); break; } @@ -9830,10 +9830,10 @@ qtdemux_audio_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, /* ? */ default: { - char *s; + char *s, fourstr[5]; - s = g_strdup_printf ("audio/x-gst-fourcc-%" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (fourcc)); + g_snprintf (fourstr, 5, "%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); + s = g_strdup_printf ("audio/x-gst-fourcc-%s", g_strstrip (fourstr)); caps = gst_caps_new_empty_simple (s); break; } @@ -9883,10 +9883,10 @@ qtdemux_sub_caps (GstQTDemux * qtdemux, QtDemuxStream * stream, break; default: { - char *s; + char *s, fourstr[5]; - s = g_strdup_printf ("text/x-gst-fourcc-%" GST_FOURCC_FORMAT, - GST_FOURCC_ARGS (fourcc)); + g_snprintf (fourstr, 5, "%" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (fourcc)); + s = g_strdup_printf ("text/x-gst-fourcc-%s", g_strstrip (fourstr)); caps = gst_caps_new_empty_simple (s); break; }