Zebediah Figura : vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess().
Alexandre Julliard
julliard at winehq.org
Wed Dec 2 15:20:59 CST 2020
Module: vkd3d
Branch: master
Commit: dc7fd3760d4ca358568d676cfad3dfb0a1e478e2
URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=dc7fd3760d4ca358568d676cfad3dfb0a1e478e2
Author: Zebediah Figura <zfigura at codeweavers.com>
Date: Tue Dec 1 20:51:09 2020 -0600
vkd3d-utils: Return an error from open_include() if a NULL ID3DInclude was passed to D3DPreprocess().
Signed-off-by: Zebediah Figura <zfigura at codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at 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 f799d0a..2bbedd8 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;
More information about the wine-cvs
mailing list