From 316ad76a88d95d725764096f0dd7b0dd1166a51b Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 22 Mar 2018 15:05:48 +0100 Subject: [PATCH] sysdeps-win: Print word-size-dependent offset correctly AddrPC.Offset is the same size as a pointer, but previously we printed it as though it was the same size as a long, which is 32 bits on 64-bit Windows. Reviewed-by: Simon McVittie Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105662 (cherry picked from commit 577813cf3a89df804efa6d85a1c5415ba12806ec) --- dbus/dbus-sysdeps-win.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c index 74a9501..0deedea 100644 --- a/dbus/dbus-sysdeps-win.c +++ b/dbus/dbus-sysdeps-win.c @@ -2556,7 +2556,7 @@ static void dump_backtrace_for_thread (HANDLE hThread) DPRINTF ("%3d %s", i++, pSymbol->Name); } else - DPRINTF ("%3d 0x%lx", i++, sf.AddrPC.Offset); + DPRINTF ("%3d 0x%Ix", i++, sf.AddrPC.Offset); line.SizeOfStruct = sizeof(IMAGEHLP_LINE); if (SymGetLineFromAddr (GetCurrentProcess (), sf.AddrPC.Offset, &dwDisplacement, &line)) -- 2.7.4