dbghelp: Don't require a 16-bit stack for StackWalk.

e42d1a8c · Alexandre Julliard · 85afcdbf · e42d1a8c
Commit e42d1a8c authored Jan 27, 2010 by Alexandre Julliard
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

cpu_i386.c dlls/dbghelp/cpu_i386.c +5 -1

No files found.
--- a/dlls/dbghelp/cpu_i386.c
+++ b/dlls/dbghelp/cpu_i386.c
@@ -146,7 +146,11 @@ static BOOL i386_stack_walk(struct cpu_stack_walk* csw, LPSTACKFRAME64 frame)
                goto done_err;
            }
            next_switch = p;
-            if (curr_mode == stm_16bit)
+            if (!next_switch)  /* no 16-bit stack */
+            {
+                curr_switch = 0;
+            }
+            else if (curr_mode == stm_16bit)
            {
                if (!sw_read_mem(csw, next_switch, &frame32, sizeof(frame32)))
                {