summaryrefslogtreecommitdiff
path: root/libavformat/avidec.c
diff options
context:
space:
mode:
authorMartin Storsjö <martin@martin.st>2013-09-28 00:41:31 +0300
committerMartin Storsjö <martin@martin.st>2013-09-29 19:56:22 +0300
commit8d07258bb6063d0780ce2d39443d6dc6d8eedc5a (patch)
tree8ea45e350c1271453fa229c66655c7308841b975 /libavformat/avidec.c
parent68ff9981283a56c731f00c2ee7901103665092fc (diff)
avidec: Make sure a packet is large enough before reading its data
Reported-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind CC: libav-stable@libav.org Signed-off-by: Martin Storsjö <martin@martin.st>
Diffstat (limited to 'libavformat/avidec.c')
-rw-r--r--libavformat/avidec.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/avidec.c b/libavformat/avidec.c
index 1212c6a09b..3616281152 100644
--- a/libavformat/avidec.c
+++ b/libavformat/avidec.c
@@ -816,7 +816,8 @@ fail:
static int read_gab2_sub(AVStream *st, AVPacket *pkt)
{
- if (!strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) {
+ if (pkt->size >= 7 &&
+ !strcmp(pkt->data, "GAB2") && AV_RL16(pkt->data + 5) == 2) {
uint8_t desc[256];
int score = AVPROBE_SCORE_EXTENSION, ret;
AVIStream *ast = st->priv_data;