ntdll: Properly handle 0 returns from unw_step().

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

ntdll: Properly handle 0 returns from unw_step().
d82f06c0 · Henri Verbeet · Alexandre Julliard · aa482426 · d82f06c0 · d82f06c0
Commit d82f06c0 authored Oct 18, 2019 by Henri Verbeet Committed by Alexandre Julliard Oct 22, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 2 deletions

signal_arm64.c dlls/ntdll/signal_arm64.c +5 -1

signal_x86_64.c dlls/ntdll/signal_x86_64.c +6 -1

No files found.
--- a/dlls/ntdll/signal_arm64.c
+++ b/dlls/ntdll/signal_arm64.c
@@ -523,7 +523,11 @@ static NTSTATUS libunwind_virtual_unwind( ULONG_PTR ip, ULONG_PTR *frame, CONTEX
           ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler,
           (unsigned long)info.lsda, (unsigned long)info.unwind_info );

-    rc = unw_step( &cursor );
+    if (!(rc = unw_step( &cursor )))
+    {
+        WARN( "last frame\n" );
+        return STATUS_SUCCESS;
+    }
    if (rc < 0)
    {
        WARN( "failed to unwind: %d\n", rc );

--- a/dlls/ntdll/signal_x86_64.c
+++ b/dlls/ntdll/signal_x86_64.c
@@ -1524,7 +1524,12 @@ static NTSTATUS libunwind_virtual_unwind( ULONG64 ip, BOOL* got_info, ULONG64 *f
           ip, (unsigned long)info.start_ip, (unsigned long)info.end_ip, (unsigned long)info.handler,
           (unsigned long)info.lsda, (unsigned long)info.unwind_info );

-    rc = unw_step(&cursor);
+    if (!(rc = unw_step( &cursor )))
+    {
+        WARN( "last frame\n" );
+        *got_info = FALSE;
+        return STATUS_SUCCESS;
+    }
    if (rc < 0)
    {
        WARN( "failed to unwind: %d\n", rc );