RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 20:37:04 +00:00
Code Issues Projects Releases Wiki Activity

avcodec/pthread_frame: check avctx on deallocation

Browse Source 
Fixes null pointer dereferences
Fixes: af1a5a33e67e479f439239097bd0d4fd_signal_sigsegv_7ffff713351a_152_Dolby_Rain_Logo.pmp with memlimit of 8388608

Found-by: Samuel Groß, Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit 5d346feafa)

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-13 21:19:04 +02:00
parent f78573466d
commit bd5cf1dd8f
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/pthread_frame.c
View File

@ -573,7 +573,7 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
pthread_join(p->thread, NULL); pthread_join(p->thread, NULL);
p->thread_init=0; p->thread_init=0;
if (codec->close) if (codec->close && p->avctx)
codec->close(p->avctx); codec->close(p->avctx);
avctx->codec = NULL; avctx->codec = NULL;
@ -593,12 +593,13 @@ void ff_frame_thread_free(AVCodecContext *avctx, int thread_count)
av_packet_unref(&p->avpkt); av_packet_unref(&p->avpkt);
av_freep(&p->released_buffers); av_freep(&p->released_buffers);
if (i) { if (i && p->avctx) {
av_freep(&p->avctx->priv_data); av_freep(&p->avctx->priv_data);
av_freep(&p->avctx->slice_offset); av_freep(&p->avctx->slice_offset);
} }
av_freep(&p->avctx->internal); if (p->avctx)
av_freep(&p->avctx->internal);
av_freep(&p->avctx); av_freep(&p->avctx);
} }