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/hlsl: Avoid leaks on memory allocation failures when parsing initializers.

Browse Source 
Signed-off-by: Francisco Casas <fcasas@codeweavers.com>
Signed-off-by: Zebediah Figura <zfigura@codeweavers.com>
Signed-off-by: Giovanni Mascellani <gmascellani@codeweavers.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Francisco Casas 2022-03-30 23:38:26 +02:00 committed by Alexandre Julliard
parent 889e5af5dd
commit bed085cf9a
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
libs/vkd3d-shader/hlsl.y
View File

@ -3208,7 +3208,10 @@ complex_initializer:
{ {
$$.args_count = 1; $$.args_count = 1;
if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args))))
{
destroy_instr_list($1);
YYABORT; YYABORT;
}
$$.args[0] = node_from_list($1); $$.args[0] = node_from_list($1);
$$.instrs = $1; $$.instrs = $1;
} }
@ -3229,15 +3232,25 @@ initializer_expr_list:
{ {
$$.args_count = 1; $$.args_count = 1;
if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args)))) if (!($$.args = hlsl_alloc(ctx, sizeof(*$$.args))))
{
destroy_instr_list($1);
YYABORT; YYABORT;
}
$$.args[0] = node_from_list($1); $$.args[0] = node_from_list($1);
$$.instrs = $1; $$.instrs = $1;
} }
| initializer_expr_list ',' initializer_expr | initializer_expr_list ',' initializer_expr
{ {
struct hlsl_ir_node **new_args;
$$ = $1; $$ = $1;
if (!($$.args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args)))) if (!(new_args = hlsl_realloc(ctx, $$.args, ($$.args_count + 1) * sizeof(*$$.args))))
{
free_parse_initializer(&$$);
destroy_instr_list($3);
YYABORT; YYABORT;
}
$$.args = new_args;
$$.args[$$.args_count++] = node_from_list($3); $$.args[$$.args_count++] = node_from_list($3);
list_move_tail($$.instrs, $3); list_move_tail($$.instrs, $3);
vkd3d_free($3); vkd3d_free($3);