[FFmpeg-devel] [PATCH 2/2] avcodec/videotoolboxenc: fix use after destroy
quinkblack at foxmail.com
quinkblack at foxmail.com
Thu Aug 27 00:38:45 EEST 2020
From: Zhao Zhili <zhilizhao at tencent.com>
The lock is used in clear_frame_queue().
---
libavcodec/videotoolboxenc.c | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/libavcodec/videotoolboxenc.c b/libavcodec/videotoolboxenc.c
index 988782f10d..758db9641f 100644
--- a/libavcodec/videotoolboxenc.c
+++ b/libavcodec/videotoolboxenc.c
@@ -2496,14 +2496,17 @@ static av_cold int vtenc_close(AVCodecContext *avctx)
{
VTEncContext *vtctx = avctx->priv_data;
- pthread_cond_destroy(&vtctx->cv_sample_sent);
- pthread_mutex_destroy(&vtctx->lock);
-
- if(!vtctx->session) return 0;
+ if(!vtctx->session) {
+ pthread_cond_destroy(&vtctx->cv_sample_sent);
+ pthread_mutex_destroy(&vtctx->lock);
+ return 0;
+ }
VTCompressionSessionCompleteFrames(vtctx->session,
kCMTimeIndefinite);
clear_frame_queue(vtctx);
+ pthread_cond_destroy(&vtctx->cv_sample_sent);
+ pthread_mutex_destroy(&vtctx->lock);
CFRelease(vtctx->session);
vtctx->session = NULL;
--
2.28.0
More information about the ffmpeg-devel
mailing list