From dc7fd3760d4ca358568d676cfad3dfb0a1e478e2 Mon Sep 17 00:00:00 2001 From: Zebediah Figura <zfigura@codeweavers.com> Date: Tue, 1 Dec 2020 20:51:09 -0600 Subject: [PATCH] vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess(). Signed-off-by: Zebediah Figura <zfigura@codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org> --- libs/vkd3d-utils/vkd3d_utils_main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libs/vkd3d-utils/vkd3d_utils_main.c b/libs/vkd3d-utils/vkd3d_utils_main.c index f799d0a25c..2bbedd8b11 100644 --- a/libs/vkd3d-utils/vkd3d_utils_main.c +++ b/libs/vkd3d-utils/vkd3d_utils_main.c @@ -131,6 +131,9 @@ static int open_include(const char *filename, bool local, const char *parent_dat ID3DInclude *iface = context; unsigned int size; + if (!iface) + return VKD3D_ERROR; + if (FAILED(ID3DInclude_Open(iface, local ? D3D_INCLUDE_LOCAL : D3D_INCLUDE_SYSTEM, filename, parent_data, &code->code, &size))) return VKD3D_ERROR; -- GitLab