57 lines
2.1 KiB
Plaintext
57 lines
2.1 KiB
Plaintext
$OpenBSD: patch-execinfo_c,v 1.2 2008/11/11 15:48:47 naddy Exp $
|
|
--- execinfo.c.orig Mon Jul 19 07:21:09 2004
|
|
+++ execinfo.c Tue Nov 11 16:45:54 2008
|
|
@@ -69,7 +69,8 @@ backtrace(void **buffer, int size)
|
|
char **
|
|
backtrace_symbols(void *const *buffer, int size)
|
|
{
|
|
- int i, clen, alen, offset;
|
|
+ size_t clen, alen;
|
|
+ int i, offset;
|
|
char **rval;
|
|
char *cp;
|
|
Dl_info info;
|
|
@@ -78,7 +79,6 @@ backtrace_symbols(void *const *buffer, int size)
|
|
rval = malloc(clen);
|
|
if (rval == NULL)
|
|
return NULL;
|
|
- (char **)cp = &(rval[size]);
|
|
for (i = 0; i < size; i++) {
|
|
if (dladdr(buffer[i], &info) != 0) {
|
|
if (info.dli_sname == NULL)
|
|
@@ -92,14 +92,14 @@ backtrace_symbols(void *const *buffer, int size)
|
|
2 + /* " <" */
|
|
strlen(info.dli_sname) + /* "function" */
|
|
1 + /* "+" */
|
|
- D10(offset) + /* "offset */
|
|
+ 10 + /* "offset */
|
|
5 + /* "> at " */
|
|
strlen(info.dli_fname) + /* "filename" */
|
|
1; /* "\0" */
|
|
rval = realloc_safe(rval, clen + alen);
|
|
if (rval == NULL)
|
|
return NULL;
|
|
- snprintf(cp, alen, "%p <%s+%d> at %s",
|
|
+ snprintf((char *) rval + clen, alen, "%p <%s+%d> at %s",
|
|
buffer[i], info.dli_sname, offset, info.dli_fname);
|
|
} else {
|
|
alen = 2 + /* "0x" */
|
|
@@ -108,11 +108,14 @@ backtrace_symbols(void *const *buffer, int size)
|
|
rval = realloc_safe(rval, clen + alen);
|
|
if (rval == NULL)
|
|
return NULL;
|
|
- snprintf(cp, alen, "%p", buffer[i]);
|
|
+ snprintf((char *) rval + clen, alen, "%p", buffer[i]);
|
|
}
|
|
- rval[i] = cp;
|
|
- cp += alen;
|
|
+ rval[i] = (char *) clen;
|
|
+ clen += alen;
|
|
}
|
|
+
|
|
+ for (i = 0; i < size; i++)
|
|
+ rval[i] += (long) rval;
|
|
|
|
return rval;
|
|
}
|