RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

libplacebo: fix out-of-bounds read with --really-quiet 

With --really-quiet the message level is -1 which is not in the
msg_lev_to_pl_log enum, so handle it explicitly.
This commit is contained in:
Guido Cella 2024-01-14 20:58:14 +01:00 committed by Dudemanguy
parent de0849404b
commit 07dd577a6b
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/out/placebo/utils.c
View File

@ -44,6 +44,12 @@ static void log_cb(void *priv, enum pl_log_level level, const char *msg)
mp_msg(log, pl_log_to_msg_lev[level], "%s\n", msg); mp_msg(log, pl_log_to_msg_lev[level], "%s\n", msg);
} }
static int determine_pl_log_level(struct mp_log *log)
{
int log_level = mp_msg_level(log);
return log_level == -1 ? PL_LOG_NONE : msg_lev_to_pl_log[log_level];
}
static void log_cb_probing(void *priv, enum pl_log_level level, const char *msg) static void log_cb_probing(void *priv, enum pl_log_level level, const char *msg)
{ {
struct mp_log *log = priv; struct mp_log *log = priv;
@ -54,7 +60,7 @@ pl_log mppl_log_create(void *tactx, struct mp_log *log)
{ {
return pl_log_create(PL_API_VER, &(struct pl_log_params) { return pl_log_create(PL_API_VER, &(struct pl_log_params) {
.log_cb = log_cb, .log_cb = log_cb,
.log_level = msg_lev_to_pl_log[mp_msg_level(log)], .log_level = determine_pl_log_level(log),
.log_priv = mp_log_new(tactx, log, "libplacebo"), .log_priv = mp_log_new(tactx, log, "libplacebo"),
}); });
} }