From 78c0d14312d9e89f29178ce07018f487759fb841 Mon Sep 17 00:00:00 2001 From: Friedrich Vock Date: Tue, 30 Jan 2024 15:51:36 +0100 Subject: [PATCH] mesa/main: Use secure_getenv for shader dumping Reviewed-by: Eric Engestrom Cc: mesa-stable Part-of: (cherry picked from commit 72f95a8364c018ed833aab171f8d5fa65145cb10) --- .pick_status.json | 2 +- src/mesa/main/shaderapi.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f884e5090ed..764d1086a05 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -64,7 +64,7 @@ "description": "mesa/main: Use secure_getenv for shader dumping", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index 1b188a4c800..faf41935cb7 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -177,7 +177,7 @@ _mesa_get_shader_capture_path(void) static const char *path = NULL; if (!read_env_var) { - path = getenv("MESA_SHADER_CAPTURE_PATH"); + path = secure_getenv("MESA_SHADER_CAPTURE_PATH"); read_env_var = true; #if ANDROID_SHADER_CAPTURE @@ -1971,7 +1971,7 @@ _mesa_dump_shader_source(const gl_shader_stage stage, const char *source, if (!path_exists) return; - dump_path = getenv("MESA_SHADER_DUMP_PATH"); + dump_path = secure_getenv("MESA_SHADER_DUMP_PATH"); if (!dump_path) { path_exists = false; return;