Zebediah Figura : d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind).

Alexandre Julliard julliard at winehq.org
Tue Nov 10 13:46:24 CST 2020


Module: wine
Branch: stable
Commit: fb267b661ddcf391b725a5e4e7532cfe1c47ea67
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=fb267b661ddcf391b725a5e4e7532cfe1c47ea67

Author: Zebediah Figura <z.figura12 at gmail.com>
Date:   Mon Aug 10 11:11:35 2020 -0500

d3dcompiler: Iterate through the instruction list in reverse in free_instr_list() (Valgrind).

Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Matteo Bruni <mbruni at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
(cherry picked from commit 23cc3003722317b72bd798a00678f24c36937762)
Signed-off-by: Michael Stefaniuc <mstefani at winehq.org>

---

 dlls/d3dcompiler_43/utils.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dlls/d3dcompiler_43/utils.c b/dlls/d3dcompiler_43/utils.c
index 1436ed6bf3e..ad973487f47 100644
--- a/dlls/d3dcompiler_43/utils.c
+++ b/dlls/d3dcompiler_43/utils.c
@@ -2126,7 +2126,9 @@ void free_instr_list(struct list *list)
 
     if (!list)
         return;
-    LIST_FOR_EACH_ENTRY_SAFE(node, next_node, list, struct hlsl_ir_node, entry)
+    /* Iterate in reverse, to avoid use-after-free when unlinking sources from
+     * the "uses" list. */
+    LIST_FOR_EACH_ENTRY_SAFE_REV(node, next_node, list, struct hlsl_ir_node, entry)
         free_instr(node);
     d3dcompiler_free(list);
 }




More information about the wine-cvs mailing list