From b7cd60a354731d61ee3a3184fd4be610382ca1d6 Mon Sep 17 00:00:00 2001
From: Rocknest <35231115+Rocknest@users.noreply.github.com>
Date: Wed, 29 Jan 2020 21:09:00 +0200
Subject: Changing stuff and seeing what happens

---
 lib/std/debug.zig | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'lib/std/debug.zig')

diff --git a/lib/std/debug.zig b/lib/std/debug.zig
index 561993fb99..acc3f36412 100644
--- a/lib/std/debug.zig
+++ b/lib/std/debug.zig
@@ -129,7 +129,7 @@ pub fn dumpStackTraceFromBase(bp: usize, ip: usize) void {
         return;
     };
     const tty_config = detectTTYConfig();
-    printSourceAtAddress(debug_info, stderr, ip, tty_config) catch return;
+    printSourceAtAddress(debug_info, stderr, if (builtin.os == .windows) (ip + 1) else ip, tty_config) catch return;
     const first_return_address = @intToPtr(*const usize, bp + @sizeOf(usize)).*;
     printSourceAtAddress(debug_info, stderr, first_return_address - 1, tty_config) catch return;
     var it = StackIterator{
@@ -325,6 +325,7 @@ pub const StackIterator = struct {
         }
 
         const return_address = @intToPtr(*const usize, self.fp - fp_adjust_factor + @sizeOf(usize)).*;
+        if (return_address == 0) return null;
         return return_address;
     }
 };
-- 
cgit v1.2.3