[libav-commits] opusdec: make sure all substreams have the same number of coded samples

Anton Khirnov git at libav.org
Thu Nov 27 14:11:40 CET 2014


Module: libav
Branch: master
Commit: 1973079417e8701b52ba810a72cb6c7c6f7f9a56

Author:    Anton Khirnov <anton at khirnov.net>
Committer: Anton Khirnov <anton at khirnov.net>
Date:      Mon Nov 24 11:16:46 2014 +0100

opusdec: make sure all substreams have the same number of coded samples

Fixes invalid writes with invalid multichannel streams.

CC:libav-stable at libav.org

---

 libavcodec/opusdec.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavcodec/opusdec.c b/libavcodec/opusdec.c
index bf3a54b..771922e 100644
--- a/libavcodec/opusdec.c
+++ b/libavcodec/opusdec.c
@@ -500,6 +500,12 @@ static int opus_decode_packet(AVCodecContext *avctx, void *data,
                 av_log(avctx, AV_LOG_ERROR, "Error parsing the packet header.\n");
                 return ret;
             }
+            if (coded_samples != s->packet.frame_count * s->packet.frame_duration) {
+                av_log(avctx, AV_LOG_ERROR,
+                       "Mismatching coded sample count in substream %d.\n", i);
+                return AVERROR_INVALIDDATA;
+            }
+
             s->silk_samplerate = get_silk_samplerate(s->packet.config);
         }
 



More information about the libav-commits mailing list