wine/vkd3d
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/vkd3d.git synced 2025-01-28 13:05:02 -08:00
Code Issues Packages Projects Releases Wiki Activity

vkd3d-shader/dxil: Release memory on exceptional paths when parsing DXIL code. (Valgrind)

Browse Source
This commit is contained in:
Giovanni Mascellani 2024-09-26 11:39:04 +02:00 committed by Henri Verbeet
parent 466c8bfbb7
commit afa2fd527c
Notes: Henri Verbeet 2024-09-26 17:49:47 +02:00 
Approved-by: Giovanni Mascellani (@giomasce)
Approved-by: Henri Verbeet (@hverbeet)
Merge-Request: https://gitlab.winehq.org/wine/vkd3d/-/merge_requests/1119
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10530,9 +10530,16 @@ static enum vkd3d_result sm6_parser_init(struct sm6_parser *sm6, struct vsir_pro
dxil_block_destroy(&sm6->root_block); dxil_block_destroy(&sm6->root_block);
if (sm6->p.failed)
{
ret = VKD3D_ERROR_INVALID_SHADER;
goto fail;
}
return VKD3D_OK; return VKD3D_OK;
fail: fail:
sm6_parser_cleanup(sm6);
vsir_program_cleanup(program); vsir_program_cleanup(program);
return ret; return ret;
} }
@ -10574,18 +10581,20 @@ int dxil_parse(const struct vkd3d_shader_compile_info *compile_info, uint64_t co
free_dxbc_shader_desc(&dxbc_desc); free_dxbc_shader_desc(&dxbc_desc);
vkd3d_free(byte_code); vkd3d_free(byte_code);
if (!sm6.p.failed && ret >= 0)
ret = vkd3d_shader_parser_validate(&sm6.p, config_flags);
if (sm6.p.failed && ret >= 0)
ret = VKD3D_ERROR_INVALID_SHADER;
sm6_parser_cleanup(&sm6);
if (ret < 0) if (ret < 0)
{ {
WARN("Failed to parse shader.\n"); WARN("Failed to parse shader.\n");
return ret; return ret;
} }
return ret; if ((ret = vkd3d_shader_parser_validate(&sm6.p, config_flags)) < 0)
{
sm6_parser_cleanup(&sm6);
vsir_program_cleanup(program);
return ret;
}
sm6_parser_cleanup(&sm6);
return VKD3D_OK;
} }