aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-09-08 20:27:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-03-08 15:32:43 +0100
commitec39abcd37022472b49abead9d2a87c7678a6ceb (patch)
tree0b87296b0f0d6c95b90df88cc988e448d0f05d98
parent66fcda7e7043d227b3d3c73fbbb0b6688d3d8927 (diff)
downloadffmpeg-ec39abcd37022472b49abead9d2a87c7678a6ceb.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.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index f5222d8b8a..d7b28d6c38 100644
--- a/libavcodec/truemotion2.c
+++ b/libavcodec/truemotion2.c
@@ -922,14 +922,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;