From 3ed65d98c616d52e2544c8b81aa3997f28bb88f5 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Thu, 17 Oct 2013 00:48:43 +0200 Subject: avutil/log: fix race between setting and using the log callback Found-by: wm4 Signed-off-by: Michael Niedermayer --- libavutil/log.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavutil/log.c b/libavutil/log.c index 53be3ea4e9..5ee0c5d48f 100644 --- a/libavutil/log.c +++ b/libavutil/log.c @@ -268,8 +268,9 @@ void av_log(void* avcl, int level, const char *fmt, ...) void av_vlog(void* avcl, int level, const char *fmt, va_list vl) { - if(av_log_callback) - av_log_callback(avcl, level, fmt, vl); + void (*log_callback)(void*, int, const char*, va_list) = av_log_callback; + if (log_callback) + log_callback(avcl, level, fmt, vl); } int av_log_get_level(void) -- cgit v1.2.3