Commit e5e353c8 authored by David CARLIER's avatar David CARLIER Committed by Oran Agra
Browse files

debug.c: NetBSD build warning fix. (#7810)

The symbol base address is a const on this system.

(cherry picked from commit eabe3eae)
parent 0bdddd3c
...@@ -1638,13 +1638,14 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) { ...@@ -1638,13 +1638,14 @@ void sigsegvHandler(int sig, siginfo_t *info, void *secret) {
/* Find the address of the next page, which is our "safety" /* Find the address of the next page, which is our "safety"
* limit when dumping. Then try to dump just 128 bytes more * limit when dumping. Then try to dump just 128 bytes more
* than EIP if there is room, or stop sooner. */ * than EIP if there is room, or stop sooner. */
void *base = (void *)info.dli_saddr;
unsigned long next = ((unsigned long)eip + sz) & ~(sz-1); unsigned long next = ((unsigned long)eip + sz) & ~(sz-1);
unsigned long end = (unsigned long)eip + 128; unsigned long end = (unsigned long)eip + 128;
if (end > next) end = next; if (end > next) end = next;
len = end - (unsigned long)info.dli_saddr; len = end - (unsigned long)base;
serverLogHexDump(LL_WARNING, "dump of function", serverLogHexDump(LL_WARNING, "dump of function",
info.dli_saddr ,len); base ,len);
dumpX86Calls(info.dli_saddr,len); dumpX86Calls(base,len);
} }
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment