d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pull in fix from upstream NetBSD rev. 1.5:

Browse Source 
If Unwind_Backtrace is broken, ctx.n will still contain ~0, and we will
    return that which poor behavior for the user, so return 0 instead.
    We could document ~0 to be an error, but that would deviate from the
    Linux behavior which is not desirable. Noted by Poul-Henning Kamp

PR:		209842
This commit is contained in:
Poul-Henning Kamp 2020-09-21 16:43:38 +00:00
parent 6d4b6bd3ce
commit 895a7e604d
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=365952
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
contrib/libexecinfo/unwind.c
View File

@ -67,7 +67,9 @@ backtrace(void **arr, size_t len)
ctx.n = (size_t)~0;
_Unwind_Backtrace(tracer, &ctx);
if (ctx.n != (size_t)~0 && ctx.n > 0)
if (ctx.n == (size_t)~0)
ctx.n = 0;
else if (ctx.n > 0)
ctx.arr[--ctx.n] = NULL; /* Skip frame below __start */
return ctx.n;