eden-emu/FFmpeg
20
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

lavc/utils: disallow zero sized packets with data set in avcodec_send_packet

Browse source 
Reviewed-by: wm4 <nfxjfg@googlemail.com>
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2016-09-30 10:58:19 +02:00
parent f4e692a0e9
commit 2face3e7b5
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libavcodec/utils.c
View file

@ -2819,6 +2819,9 @@ int attribute_align_arg avcodec_send_packet(AVCodecContext *avctx, const AVPacke
if (avctx->internal->draining) if (avctx->internal->draining)
return AVERROR_EOF; return AVERROR_EOF;
if (avpkt && !avpkt->size && avpkt->data)
return AVERROR(EINVAL);
if (!avpkt || !avpkt->size) { if (!avpkt || !avpkt->size) {
avctx->internal->draining = 1; avctx->internal->draining = 1;
avpkt = NULL; avpkt = NULL;