PR other/67457

ian · ian · commit 37bab844414c · 2015-09-08T13:49:19.000Z
* mmap.c (backtrace_alloc): Correct test for mmap failure.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@227529 138bc75d-0d04-0410-961f-82ee72b054a4
diff --git a/libbacktrace/ChangeLog b/libbacktrace/ChangeLog
@@ -1,3 +1,8 @@
+2015-09-08  Ian Lance Taylor  <iant@google.com>
+
+	PR other/67457
+	* mmap.c (backtrace_alloc): Correct test for mmap failure.
+
 2015-08-31  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
 	* configure.ac: For spu-*-* targets, set have_fcntl to no.
diff --git a/libbacktrace/mmap.c b/libbacktrace/mmap.c
@@ -139,7 +139,7 @@ backtrace_alloc (struct backtrace_state *state,
       asksize = (size + pagesize - 1) & ~ (pagesize - 1);
       page = mmap (NULL, asksize, PROT_READ | PROT_WRITE,
 		   MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
-      if (page == NULL)
+      if (page == MAP_FAILED)
 	error_callback (data, "mmap", errno);
       else
 	{

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ backtrace_alloc (struct backtrace_state *state,`
`139`	`139`	`asksize = (size + pagesize - 1) & ~ (pagesize - 1);`
`140`	`140`	`page = mmap (NULL, asksize, PROT_READ \| PROT_WRITE,`
`141`	`141`	`MAP_PRIVATE \| MAP_ANONYMOUS, -1, 0);`
`142`		`- if (page == NULL)`
	`142`	`+ if (page == MAP_FAILED)`
`143`	`143`	`error_callback (data, "mmap", errno);`
`144`	`144`	`else`
`145`	`145`	`{`