wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2024-11-21 16:46:41 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Avoid null dereference on failure to find function pointer type.

Browse Source 
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=55684
This commit is contained in:
Conor McCarthy 2024-01-12 00:09:56 +10:00 committed by Alexandre Julliard
parent 78d95889bd
commit ac9b14599f
Notes: Alexandre Julliard 2024-01-11 23:14:53 +01:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Approved-by: Alexandre Julliard (@julliard)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/555
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libs/vkd3d-shader/dxil.c
View File

@ -2331,8 +2331,8 @@ static const struct sm6_value *sm6_parser_get_value_by_ref(struct sm6_parser *sm
static bool sm6_parser_declare_function(struct sm6_parser *sm6, const struct dxil_record *record) static bool sm6_parser_declare_function(struct sm6_parser *sm6, const struct dxil_record *record)
{ {
const struct sm6_type *type, *ret_type;
const unsigned int max_count = 15; const unsigned int max_count = 15;
const struct sm6_type *ret_type;
struct sm6_value *fn; struct sm6_value *fn;
unsigned int i, j; unsigned int i, j;
@ -2347,18 +2347,18 @@ static bool sm6_parser_declare_function(struct sm6_parser *sm6, const struct dxi
fn->u.function.name = ""; fn->u.function.name = "";
} }
if (!(fn->type = sm6_parser_get_type(sm6, record->operands[0]))) if (!(type = sm6_parser_get_type(sm6, record->operands[0])))
return false; return false;
if (!sm6_type_is_function(fn->type)) if (!sm6_type_is_function(type))
{ {
WARN("Type is not a function.\n"); WARN("Type is not a function.\n");
return false; return false;
} }
ret_type = fn->type->u.function->ret_type; ret_type = type->u.function->ret_type;
if (!(fn->type = sm6_type_get_pointer_to_type(fn->type, ADDRESS_SPACE_DEFAULT, sm6))) if (!(fn->type = sm6_type_get_pointer_to_type(type, ADDRESS_SPACE_DEFAULT, sm6)))
{ {
WARN("Failed to get pointer type for type %u.\n", fn->type->class); WARN("Failed to get pointer type for type %u.\n", type->class);
return false; return false;
} }