Skip to content

Commit

Permalink
* backtrace.c (backtrace_full): When testing whether we can
Browse files Browse the repository at this point in the history
	allocate memory, call mmap directly, and munmap the memory.

Fixes ianlancetaylor/libbacktrace#13 .


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@259434 138bc75d-0d04-0410-961f-82ee72b054a4
  • Loading branch information
ian committed Apr 17, 2018
1 parent 99c7343 commit b77ef01
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 11 deletions.
5 changes: 5 additions & 0 deletions libbacktrace/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2018-04-17 Ian Lance Taylor <iant@golang.org>

* backtrace.c (backtrace_full): When testing whether we can
allocate memory, call mmap directly, and munmap the memory.

2018-04-04 Jakub Jelinek <jakub@redhat.com>

PR other/85161
Expand Down
44 changes: 33 additions & 11 deletions libbacktrace/backtrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,26 @@ POSSIBILITY OF SUCH DAMAGE. */

#include "config.h"

#include <unistd.h>
#include <sys/types.h>

#if !BACKTRACE_USES_MALLOC
#include <sys/mman.h>
#endif

#include "unwind.h"
#include "backtrace.h"
#include "backtrace-supported.h"
#include "internal.h"

#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
#endif

#ifndef MAP_FAILED
#define MAP_FAILED ((void *)-1)
#endif

/* The main backtrace_full routine. */

/* Data passed through _Unwind_Backtrace. */
Expand Down Expand Up @@ -104,7 +118,6 @@ backtrace_full (struct backtrace_state *state, int skip,
backtrace_error_callback error_callback, void *data)
{
struct backtrace_data bdata;
void *p;

bdata.skip = skip + 1;
bdata.state = state;
Expand All @@ -113,16 +126,25 @@ backtrace_full (struct backtrace_state *state, int skip,
bdata.data = data;
bdata.ret = 0;

/* If we can't allocate any memory at all, don't try to produce
file/line information. */
p = backtrace_alloc (state, 4096, NULL, NULL);
if (p == NULL)
bdata.can_alloc = 0;
else
{
backtrace_free (state, p, 4096, NULL, NULL);
bdata.can_alloc = 1;
}
#if !BACKTRACE_USES_MALLOC
{
size_t pagesize;
void *page;

/* If we can't allocate any memory at all, don't try to produce
file/line information. */
pagesize = getpagesize ();
page = mmap (NULL, pagesize, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (page == MAP_FAILED)
bdata.can_alloc = 0;
else
{
munmap (page, pagesize);
bdata.can_alloc = 1;
}
}
#endif

_Unwind_Backtrace (unwind, &bdata);
return bdata.ret;
Expand Down

0 comments on commit b77ef01

Please sign in to comment.