morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 00:44:19 +09:00
Code Issues Packages Projects Releases Wiki Activity

Fix unwind backtrace warnings

Browse Source
This commit is contained in:
akallabeth
2022-06-22 12:06:33 +02:00
committed by akallabeth
parent 66e73f8b08
commit ec8550e87f
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
winpr/libwinpr/utils/unwind/debug.c
View File

@@ -95,14 +95,19 @@ void winpr_unwind_backtrace_free(void* buffer)
char** winpr_unwind_backtrace_symbols(void* buffer, size_t* used)
{
size_t x;
char** str = NULL;
union
{
char* cp;
char** cpp;
} cnv;
unwind_context_t* ctx = buffer;
cnv.cpp = NULL;
if (!ctx)
return NULL;
str = calloc(ctx->pos * (sizeof(char*) + UNWIND_MAX_LINE_SIZE), sizeof(char*));
if (!str)
cnv.cpp = calloc(ctx->pos * (sizeof(char*) + UNWIND_MAX_LINE_SIZE), sizeof(char*));
if (!cnv.cpp)
return NULL;
if (used)
@@ -110,19 +115,19 @@ char** winpr_unwind_backtrace_symbols(void* buffer, size_t* used)
for (x = 0; x < ctx->pos; x++)
{
char* msg = str + ctx->pos * sizeof(char*) + x * UNWIND_MAX_LINE_SIZE;
char* msg = cnv.cp + ctx->pos * sizeof(char*) + x * UNWIND_MAX_LINE_SIZE;
const unwind_info_t* info = &ctx->info[x];
Dl_info dlinfo = { 0 };
int rc = dladdr(info->pc, &dlinfo);
int rc = dladdr((void*)info->pc, &dlinfo);
str[x] = msg;
cnv.cpp[x] = msg;
if (rc == 0)
_snprintf(msg, UNWIND_MAX_LINE_SIZE, "unresolvable, address=%p", info->pc);
_snprintf(msg, UNWIND_MAX_LINE_SIZE, "unresolvable, address=%p", (void*)info->pc);
else
_snprintf(msg, UNWIND_MAX_LINE_SIZE, "dli_fname=%s [%p], dli_sname=%s [%p]",
dlinfo.dli_fname, dlinfo.dli_fbase, dlinfo.dli_sname, dlinfo.dli_saddr);
}
return str;
return cnv.cpp;
}