Matteo Bruni : d3dcompiler: Free variable definitions data on allocation errors.
Alexandre Julliard
julliard at winehq.org
Sun Feb 16 15:23:59 CST 2020
Module: wine
Branch: master
Commit: 4e8ec8a6e0ffc55bf636840f5a37b0717b014d0a
URL: https://source.winehq.org/git/wine.git/?a=commit;h=4e8ec8a6e0ffc55bf636840f5a37b0717b014d0a
Author: Matteo Bruni <mbruni at codeweavers.com>
Date: Fri Feb 14 19:31:03 2020 +0100
d3dcompiler: Free variable definitions data on allocation errors.
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/d3dcompiler_43/hlsl.y | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/dlls/d3dcompiler_43/hlsl.y b/dlls/d3dcompiler_43/hlsl.y
index 52b2b6310b..b6478bf3fe 100644
--- a/dlls/d3dcompiler_43/hlsl.y
+++ b/dlls/d3dcompiler_43/hlsl.y
@@ -530,6 +530,15 @@ static void struct_var_initializer(struct list *list, struct hlsl_ir_var *var,
d3dcompiler_free(initializer->args);
}
+static void free_parse_variable_def(struct parse_variable_def *v)
+{
+ free_parse_initializer(&v->initializer);
+ d3dcompiler_free(v->name);
+ d3dcompiler_free((void *)v->semantic);
+ d3dcompiler_free(v->reg_reservation);
+ d3dcompiler_free(v);
+}
+
static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers, struct list *var_list)
{
struct hlsl_type *type;
@@ -543,7 +552,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers,
{
ERR("Out of memory.\n");
LIST_FOR_EACH_ENTRY_SAFE(v, v_next, var_list, struct parse_variable_def, entry)
- d3dcompiler_free(v);
+ free_parse_variable_def(v);
d3dcompiler_free(var_list);
return NULL;
}
@@ -558,7 +567,7 @@ static struct list *declare_vars(struct hlsl_type *basic_type, DWORD modifiers,
if (!var)
{
ERR("Out of memory.\n");
- d3dcompiler_free(v);
+ free_parse_variable_def(v);
continue;
}
if (v->array_size)
More information about the wine-cvs
mailing list