Browse Source

avformat/adxdec: check avctx->channels for invalid values

This avoids a null pointer dereference of pkt->data.

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 7faa40af98)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.4.8
Andreas Cadhalpun Michael Niedermayer 11 years ago
parent
commit
f33a2ea2ee
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavformat/adxdec.c

+ 5
- 0
libavformat/adxdec.c View File

@@ -40,6 +40,11 @@ static int adx_read_packet(AVFormatContext *s, AVPacket *pkt)
AVCodecContext *avctx = s->streams[0]->codec;
int ret, size;

if (avctx->channels <= 0) {
av_log(s, AV_LOG_ERROR, "invalid number of channels %d\n", avctx->channels);
return AVERROR_INVALIDDATA;
}

size = BLOCK_SIZE * avctx->channels;

pkt->pos = avio_tell(s->pb);


Loading…
Cancel
Save