Mesa (main): dzn: Fix unitialized var access in dzn_meta_compile_shader()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Jun 8 15:57:27 UTC 2022
Module: Mesa
Branch: main
Commit: 4f1cb63bf38fec52356b59731a97d1282a924591
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4f1cb63bf38fec52356b59731a97d1282a924591
Author: Boris Brezillon <boris.brezillon at collabora.com>
Date: Tue Jun 7 07:20:23 2022 -0700
dzn: Fix unitialized var access in dzn_meta_compile_shader()
Reviewed-by: Jesse Natalie <jenatali at microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16221>
---
src/microsoft/vulkan/dzn_meta.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/microsoft/vulkan/dzn_meta.c b/src/microsoft/vulkan/dzn_meta.c
index a1ad4d9cc45..f75fcaf91d7 100644
--- a/src/microsoft/vulkan/dzn_meta.c
+++ b/src/microsoft/vulkan/dzn_meta.c
@@ -48,7 +48,7 @@ dzn_meta_compile_shader(struct dzn_device *device, nir_shader *nir,
bool ret = nir_to_dxil(nir, &opts, &dxil_blob);
assert(ret);
- char *err;
+ char *err = NULL;
bool res = dxil_validate_module(instance->dxil_validator,
dxil_blob.data,
dxil_blob.size, &err);
@@ -70,12 +70,12 @@ dzn_meta_compile_shader(struct dzn_device *device, nir_shader *nir,
if ((instance->debug_flags & DZN_DEBUG_DXIL) &&
(instance->debug_flags & DZN_DEBUG_INTERNAL) &&
- err) {
+ !res) {
fprintf(stderr,
"== VALIDATION ERROR =============================================\n"
"%s\n"
"== END ==========================================================\n",
- err);
+ err ? err : "unknown");
ralloc_free(err);
}
assert(res);
More information about the mesa-commit
mailing list