diff options
| author | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-23 21:54:44 -0400 |
|---|---|---|
| committer | Justin Ruggles <justin.ruggles@gmail.com> | 2011-09-30 11:02:50 -0400 |
| commit | 6326afd5e90cfed9df08b652a1cd6f6a948c239a (patch) | |
| tree | 35fb9a339742eeac431f48b9cba460aa18f3d2c4 /libavcodec/utils.c | |
| parent | dcce09d64bd13ab13b86307f5a268e5c1e50c7e2 (diff) | |
| download | ffmpeg-6326afd5e90cfed9df08b652a1cd6f6a948c239a.tar.gz | |
avcodec: reject audio packets with NULL data and non-zero size
There is no valid reason the user should ever send such packets in the
first place, but the documentation for CODEC_CAP_DELAY states that the
codec is guaranteed not to get a NULL packet unless that capability is
set. That isn't true without preventing this case.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 8459e5f870..b598942354 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -747,6 +747,11 @@ int attribute_align_arg avcodec_decode_audio3(AVCodecContext *avctx, int16_t *sa avctx->pkt = avpkt; + if (!avpkt->data && avpkt->size) { + av_log(avctx, AV_LOG_ERROR, "invalid packet: NULL data, size != 0\n"); + return AVERROR(EINVAL); + } + if((avctx->codec->capabilities & CODEC_CAP_DELAY) || avpkt->size){ //FIXME remove the check below _after_ ensuring that all audio check that the available space is enough if(*frame_size_ptr < AVCODEC_MAX_AUDIO_FRAME_SIZE){ |