diff options
| author | Debarshi Ray <rishi@gnu.org> | 2012-11-02 16:39:28 +0100 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2012-11-06 19:49:50 +0000 |
| commit | 8c44361bca80fa4ed2ec6005c624343c7f4ec866 (patch) | |
| tree | a679ed195cd3952929ed47d512c34fcf509f371d /ext/speex | |
| parent | 7cbca3dcd12d7746e74d716c4f2dcd177317d6ed (diff) | |
speexdec: Don't unmap or finish_frame an invalid GstBuffer
https://bugzilla.gnome.org/show_bug.cgi?id=687464
Diffstat (limited to 'ext/speex')
| -rw-r--r-- | ext/speex/gstspeexdec.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/ext/speex/gstspeexdec.c b/ext/speex/gstspeexdec.c index 234abe619..8f9da2ade 100644 --- a/ext/speex/gstspeexdec.c +++ b/ext/speex/gstspeexdec.c @@ -392,6 +392,7 @@ gst_speex_dec_parse_data (GstSpeexDec * dec, GstBuffer * buf) /* now decode each frame, catering for unknown number of them (e.g. rtp) */ for (i = 0; i < fpp; i++) { GstBuffer *outbuf; + gboolean corrupted = FALSE; gint ret; GST_LOG_OBJECT (dec, "decoding frame %d/%d, %d bits remaining", i, fpp, @@ -425,18 +426,15 @@ gst_speex_dec_parse_data (GstSpeexDec * dec, GstBuffer * buf) } else { GST_WARNING_OBJECT (dec, "Unexpected end of stream found"); } - gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), NULL, 1); - gst_buffer_unref (outbuf); + corrupted = TRUE; } else if (ret == -2) { GST_WARNING_OBJECT (dec, "Decoding error: corrupted stream?"); - gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), NULL, 1); - gst_buffer_unref (outbuf); + corrupted = TRUE; } if (bits && speex_bits_remaining (bits) < 0) { GST_WARNING_OBJECT (dec, "Decoding overflow: corrupted stream?"); - gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), NULL, 1); - gst_buffer_unref (outbuf); + corrupted = TRUE; } if (dec->header->nb_channels == 2) speex_decode_stereo_int ((spx_int16_t *) map.data, dec->frame_size, @@ -444,7 +442,12 @@ gst_speex_dec_parse_data (GstSpeexDec * dec, GstBuffer * buf) gst_buffer_unmap (outbuf, &map); - res = gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), outbuf, 1); + if (!corrupted) { + res = gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), outbuf, 1); + } else { + res = gst_audio_decoder_finish_frame (GST_AUDIO_DECODER (dec), NULL, 1); + gst_buffer_unref (outbuf); + } if (res != GST_FLOW_OK) { GST_DEBUG_OBJECT (dec, "flow: %s", gst_flow_get_name (res)); |