diff options
| author | Guido Cella <guido@guidocella.xyz> | 2024-01-14 20:58:14 +0100 |
|---|---|---|
| committer | Dudemanguy <random342@airmail.cc> | 2024-01-20 16:09:54 +0000 |
| commit | 07dd577a6b439634b85b76df1bf912ad6abe4fcf (patch) | |
| tree | 5a2bfd7050a70de8e6262bd95737771366beb872 | |
| parent | de0849404b65876f0f8fe934c4b74f497bf4e29b (diff) | |
| download | mpv-07dd577a6b439634b85b76df1bf912ad6abe4fcf.tar.bz2 mpv-07dd577a6b439634b85b76df1bf912ad6abe4fcf.tar.xz | |
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.
| -rw-r--r-- | video/out/placebo/utils.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/video/out/placebo/utils.c b/video/out/placebo/utils.c index 1209b72121..b0f49fb32c 100644 --- a/video/out/placebo/utils.c +++ b/video/out/placebo/utils.c @@ -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); } +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) { 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) { .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"), }); } |