Skip to content

V
vlc
Commit fba2ed8a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont
Browse files
Options

messages: disable cancellation 

vlc_rwlock_rdlock() may be a cancellation point.
parent 6006bd36
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
src/misc/messages.c
View file @ fba2ed8a
...@@ -57,11 +57,14 @@ static void vlc_vaLogCallback(libvlc_int_t *vlc, int type, ...@@ -57,11 +57,14 @@ static void vlc_vaLogCallback(libvlc_int_t *vlc, int type,
va_list ap) va_list ap)
{ {
vlc_logger_t *logger = libvlc_priv(vlc)->logger; vlc_logger_t *logger = libvlc_priv(vlc)->logger;
int canc;
assert(logger != NULL); assert(logger != NULL);
canc = vlc_savecancel();
vlc_rwlock_rdlock(&logger->lock); vlc_rwlock_rdlock(&logger->lock);
logger->log(logger->sys, type, item, format, ap); logger->log(logger->sys, type, item, format, ap);
vlc_rwlock_unlock(&logger->lock); vlc_rwlock_unlock(&logger->lock);
vlc_restorecancel(canc);
} }
static void vlc_LogCallback(libvlc_int_t *vlc, int type, const vlc_log_t *item, static void vlc_LogCallback(libvlc_int_t *vlc, int type, const vlc_log_t *item,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment