summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2018-03-22 15:05:48 +0100
committerSimon McVittie <smcv@collabora.com>2018-10-04 16:54:10 +0100
commit316ad76a88d95d725764096f0dd7b0dd1166a51b (patch)
treeaed1412306c7028df305fbafe8b4ad91c110feb4
parentcface8bb166e8954c26717f31a45ef162747d263 (diff)
downloaddbus-316ad76a88d95d725764096f0dd7b0dd1166a51b.tar.gz
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 <smcv@collabora.com> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=105662 (cherry picked from commit 577813cf3a89df804efa6d85a1c5415ba12806ec)
-rw-r--r--dbus/dbus-sysdeps-win.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-win.c b/dbus/dbus-sysdeps-win.c
index 74a95018..0deedeaf 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))