From ae413a48e64274b9740c3b27398fea92108a0f0e Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 6 Aug 2015 22:40:01 +0200 Subject: avcodec/movtextdec: check that ftab has been allocated before dereferencing it Fixes potential null pointer dereference on deallocation Signed-off-by: Michael Niedermayer --- libavcodec/movtextdec.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'libavcodec') diff --git a/libavcodec/movtextdec.c b/libavcodec/movtextdec.c index 15dd43490a..83b0231f10 100644 --- a/libavcodec/movtextdec.c +++ b/libavcodec/movtextdec.c @@ -93,9 +93,11 @@ static void mov_text_cleanup(MovTextContext *m) static void mov_text_cleanup_ftab(MovTextContext *m) { int i; - for(i = 0; i < m->count_f; i++) { - av_freep(&m->ftab[i]->font); - av_freep(&m->ftab[i]); + if (m->ftab) { + for(i = 0; i < m->count_f; i++) { + av_freep(&m->ftab[i]->font); + av_freep(&m->ftab[i]); + } } av_freep(&m->ftab); } -- cgit v1.2.3