[FFmpeg-cvslog] avcodec/truemotion2: Fix av_freep arguments
Michael Niedermayer
git at videolan.org
Fri Sep 27 02:57:30 CEST 2013
ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Sun Sep 8 20:27:54 2013 +0200| [f3dc3bef4b40524b9cd61001f98d86d139363de2] | committer: Michael Niedermayer
avcodec/truemotion2: Fix av_freep arguments
Fixes null pointer dereference
Fixes Ticket2944
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
(cherry picked from commit c54aa2fb0f869ec025933944cbd1634fffe95d09)
Conflicts:
libavcodec/truemotion2.c
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f3dc3bef4b40524b9cd61001f98d86d139363de2
---
libavcodec/truemotion2.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavcodec/truemotion2.c b/libavcodec/truemotion2.c
index 2f94f56..bff8dce 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;
More information about the ffmpeg-cvslog
mailing list