generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/truemotion2: Fix av_freep arguments

Browse Source 
Fixes null pointer dereference
Fixes Ticket2944

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54aa2fb0f)

Conflicts:

	libavcodec/truemotion2.c
This commit is contained in:
Michael Niedermayer
2013-09-08 20:27:54 +02:00
parent ef121a88d5
commit aeec1a6430
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/truemotion2.c
View File

@@ -945,14 +945,14 @@ static av_cold int decode_init(AVCodecContext *avctx)
if (!l->Y1_base || !l->Y2_base || !l->U1_base || if (!l->Y1_base || !l->Y2_base || !l->U1_base ||
!l->V1_base || !l->U2_base || !l->V2_base || !l->V1_base || !l->U2_base || !l->V2_base ||
!l->last || !l->clast) { !l->last || !l->clast) {
av_freep(l->Y1_base); av_freep(&l->Y1_base);
av_freep(l->Y2_base); av_freep(&l->Y2_base);
av_freep(l->U1_base); av_freep(&l->U1_base);
av_freep(l->U2_base); av_freep(&l->U2_base);
av_freep(l->V1_base); av_freep(&l->V1_base);
av_freep(l->V2_base); av_freep(&l->V2_base);
av_freep(l->last); av_freep(&l->last);
av_freep(l->clast); av_freep(&l->clast);
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
} }
l->Y1 = l->Y1_base + l->y_stride * 4 + 4; l->Y1 = l->Y1_base + l->y_stride * 4 + 4;