diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-08 20:27:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-27 02:52:04 +0200 |
| commit | f3dc3bef4b40524b9cd61001f98d86d139363de2 (patch) | |
| tree | bdb54fa7ed7ddb656e7d1f702bcbd2828c789b33 | |
| parent | 4a5bb426e26ed8d46e5ece4ab90ff936499d8536 (diff) | |
| download | ffmpeg-f3dc3bef4b40524b9cd61001f98d86d139363de2.tar.gz | |
avcodec/truemotion2: Fix av_freep arguments
Fixes null pointer dereference
Fixes Ticket2944
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c54aa2fb0f869ec025933944cbd1634fffe95d09)
Conflicts:
libavcodec/truemotion2.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/truemotion2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c index 2f94f56824..bff8dce0ca 100644 --- a/libavcodec/truemotion2.c +++ b/libavcodec/truemotion2.c @@ -903,14 +903,14 @@ static av_cold int decode_init(AVCodecContext *avctx){ if (!l->Y1_base || !l->Y2_base || !l->U1_base || !l->V1_base || !l->U2_base || !l->V2_base || !l->last || !l->clast) { - av_freep(l->Y1_base); - av_freep(l->Y2_base); - av_freep(l->U1_base); - av_freep(l->U2_base); - av_freep(l->V1_base); - av_freep(l->V2_base); - av_freep(l->last); - av_freep(l->clast); + av_freep(&l->Y1_base); + av_freep(&l->Y2_base); + av_freep(&l->U1_base); + av_freep(&l->U2_base); + av_freep(&l->V1_base); + av_freep(&l->V2_base); + av_freep(&l->last); + av_freep(&l->clast); return AVERROR(ENOMEM); } l->Y1 = l->Y1_base + l->y_stride * 4 + 4; |