OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use __builtin_mul_overflow in xmallocarray

Browse Source 
As GCC now provides builtins for doing integer overflow checking, lets
use it when checking for overflow in xmallocarray.

Regtested on x86_64-pc-linux-gnu.

libgfortran/ChangeLog:

2019-06-14  Janne Blomqvist  <jb@gcc.gnu.org>

	* runtime/memory.c (SIZE_MAX):Remove macro definition.
	(xmallocarray): Use __builtin_mul_overflow.

From-SVN: r272295
This commit is contained in:
Janne Blomqvist 2019-06-14 19:05:54 +03:00
parent 66574c5374
commit 84d38abbc9
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libgfortran/ChangeLog
View File

@ -1,3 +1,8 @@
2019-06-14 Janne Blomqvist <jb@gcc.gnu.org>
* runtime/memory.c (SIZE_MAX):Remove macro definition.
(xmallocarray): Use __builtin_mul_overflow.
2019-05-22 Jeff Law <law@redhat.com>
PR fortran/89100

13
libgfortran/runtime/memory.c
View File

@ -26,10 +26,6 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
#include "libgfortran.h"
#include <errno.h>
#ifndef SIZE_MAX
#define SIZE_MAX ((size_t)-1)
#endif
void *
xmalloc (size_t n)
@ -52,18 +48,17 @@ void *
xmallocarray (size_t nmemb, size_t size)
{
void *p;
size_t prod;
if (!nmemb || !size)
size = nmemb = 1;
#define HALF_SIZE_T (((size_t) 1) << (__CHAR_BIT__ * sizeof (size_t) / 2))
else if (__builtin_expect ((nmemb | size) >= HALF_SIZE_T, 0)
&& nmemb > SIZE_MAX / size)
prod = 1;
else if (__builtin_mul_overflow (nmemb, size, &prod))
{
errno = ENOMEM;
os_error ("Integer overflow in xmallocarray");
}
p = malloc (nmemb * size);
p = malloc (prod);
if (!p)
os_error ("Memory allocation failed in xmallocarray");