Eric Pouech : dbghelp: When unwinding the stack, stop if the current address isn't in a known module.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 060ccb123a04f9ce34e8ec6235c46e1720fa7392
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=060ccb123a04f9ce34e8ec6235...

Author: Eric Pouech <eric.pouech(a)orange.fr>
Date:   Sat Mar 27 09:09:08 2010 +0100

dbghelp: When unwinding the stack, stop if the current address isn't in a known module.

---

 dlls/dbghelp/cpu_x86_64.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/dlls/dbghelp/cpu_x86_64.c b/dlls/dbghelp/cpu_x86_64.c
index c664fd9..f07d8e4 100644
--- a/dlls/dbghelp/cpu_x86_64.c
+++ b/dlls/dbghelp/cpu_x86_64.c
@@ -516,10 +516,8 @@ static BOOL x86_64_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame,
         deltapc = 1;
     }
 
-    if (frame->AddrPC.Offset && (base = sw_module_base(csw, frame->AddrPC.Offset)))
-        frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset);
-    else
-        frame->FuncTableEntry = NULL;
+    if (!frame->AddrPC.Offset || !(base = sw_module_base(csw, frame->AddrPC.Offset))) goto done_err;
+    frame->FuncTableEntry = sw_table_access(csw, frame->AddrPC.Offset);
     frame->AddrStack.Mode = frame->AddrFrame.Mode = frame->AddrReturn.Mode = AddrModeFlat;
     if (frame->FuncTableEntry)
     {