From: Martin Storsjö <martin@martin.st>
Date: Wed, 11 Sep 2013 12:20:01 +0000 (+0300)
Subject: smacker: Don't return packets in unallocated streams
X-Git-Tag: v10_alpha1~793
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d928023f953a28692ba27071a448259134b103b;p=platform%2Fupstream%2Flibav.git

smacker: Don't return packets in unallocated streams

Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>
---

diff --git a/libavformat/smacker.c b/libavformat/smacker.c
index cd4353a..a15bded 100644
--- a/libavformat/smacker.c
+++ b/libavformat/smacker.c
@@ -344,6 +344,8 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
         smk->cur_frame++;
         smk->nextpos = avio_tell(s->pb);
     } else {
+        if (smk->stream_id[smk->curstream] < 0)
+            return AVERROR_INVALIDDATA;
         if (av_new_packet(pkt, smk->buf_sizes[smk->curstream]))
             return AVERROR(ENOMEM);
         memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]);