[PATCH vkd3d 1/4] vkd3d-compiler: Default to VKD3D_SHADER_SOURCE_HLSL when the source size is smaller than a uint32_t.
Henri Verbeet
hverbeet at codeweavers.com
Wed Jun 22 09:09:01 CDT 2022
For example, when the input is an empty file. Leaving the source type as
VKD3D_SHADER_SOURCE_NONE would cause (potential) subsequent
get_source_type_info() calls to return NULL, resulting in a segmentation
fault.
Signed-off-by: Henri Verbeet <hverbeet at codeweavers.com>
---
programs/vkd3d-compiler/main.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c
index ab475617..9cb90cd5 100644
--- a/programs/vkd3d-compiler/main.c
+++ b/programs/vkd3d-compiler/main.c
@@ -663,11 +663,11 @@ int main(int argc, char **argv)
{
uint32_t token;
- if (options.preprocess_only)
+ if (options.preprocess_only || info.source.size < sizeof(token))
{
options.source_type = VKD3D_SHADER_SOURCE_HLSL;
}
- else if (info.source.size >= sizeof(token))
+ else
{
memcpy(&token, info.source.code, sizeof(token));
if (token == TAG_DXBC)
--
2.20.1
More information about the wine-devel
mailing list