diff options
| author | Martin Theriault <mtheriault@espial.com> | 2019-07-15 15:48:08 -0400 |
|---|---|---|
| committer | Martin Theriault <mtheriault@espial.com> | 2019-07-15 16:16:05 -0400 |
| commit | 30f85a3189a61308d796315c7cecbf7d5c88f19d (patch) | |
| tree | aa28ebc2bcdff375e017ac3d7a6bf1bdd4304d00 /gst/aiff | |
| parent | bf9ecd65cf43bb87dada09bc0d3d172a0631eacf (diff) | |
| download | gstreamer-plugins-bad-30f85a3189a61308d796315c7cecbf7d5c88f19d.tar.gz | |
aiff: Fix infinite loop in header parsing.
Diffstat (limited to 'gst/aiff')
| -rw-r--r-- | gst/aiff/aiffparse.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/gst/aiff/aiffparse.c b/gst/aiff/aiffparse.c index b1b116703..8543b0e75 100644 --- a/gst/aiff/aiffparse.c +++ b/gst/aiff/aiffparse.c @@ -643,14 +643,17 @@ gst_aiff_parse_calculate_duration (GstAiffParse * aiff) return FALSE; } -static void +static gboolean gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size) { guint flush; if (aiff->streaming) { - if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size)) - return; + if (!gst_aiff_parse_peek_chunk (aiff, &tag, &size)) { + GST_LOG_OBJECT (aiff, "Not enough data to skip tag %" GST_FOURCC_FORMAT, + GST_FOURCC_ARGS (tag)); + return FALSE; + } } GST_WARNING_OBJECT (aiff, "Ignoring tag %" GST_FOURCC_FORMAT, GST_FOURCC_ARGS (tag)); @@ -659,6 +662,7 @@ gst_aiff_parse_ignore_chunk (GstAiffParse * aiff, guint32 tag, guint32 size) if (aiff->streaming) { gst_adapter_flush (aiff->adapter, flush); } + return TRUE; } static double @@ -1116,11 +1120,15 @@ gst_aiff_parse_stream_headers (GstAiffParse * aiff) } case GST_MAKE_FOURCC ('C', 'H', 'A', 'N'):{ GST_FIXME_OBJECT (aiff, "Handle CHAN chunk with channel layouts"); - gst_aiff_parse_ignore_chunk (aiff, tag, size); + if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) { + return GST_FLOW_OK; + } break; } default: - gst_aiff_parse_ignore_chunk (aiff, tag, size); + if (!gst_aiff_parse_ignore_chunk (aiff, tag, size)) { + return GST_FLOW_OK; + } } buf = NULL; |