92e6f3a43e
2014-06-17 Janne Blomqvist <jb@gcc.gnu.org> * libgfortran.h (xmallocarray): New prototype. * runtime/memory.c (xmallocarray): New function. (xcalloc): Check for nonzero separately instead of multiplying. * generated/*.c: Regenerated. * intrinsics/cshift0.c (cshift0): Call xmallocarray instead of xmalloc. * intrinsics/eoshift0.c (eoshift0): Likewise. * intrinsics/eoshift2.c (eoshift2): Likewise. * intrinsics/pack_generic.c (pack_internal): Likewise. (pack_s_internal): Likewise. * intrinsics/reshape_generic.c (reshape_internal): Likewise. * intrinsics/spread_generic.c (spread_internal): Likewise. (spread_internal_scalar): Likewise. * intrinsics/string_intrinsics_inc.c (string_trim): Likewise. (string_minmax): Likewise. * intrinsics/transpose_generic.c (transpose_internal): Likewise. * intrinsics/unpack_generic.c (unpack_internal): Likewise. * io/list_read.c (nml_touch_nodes): Don't cast xmalloc return value. * io/transfer.c (st_set_nml_var): Call xmallocarray instead of xmalloc. * io/unit.c (get_internal_unit): Likewise. (filename_from_unit): Don't cast xmalloc return value. * io/write.c (nml_write_obj): Likewise, formatting. * m4/bessel.m4 (bessel_jn_r'rtype_kind`): Call xmallocarray instead of xmalloc. (besse_yn_r'rtype_kind`): Likewise. * m4/cshift1.m4 (cshift1): Likewise. * m4/eoshift1.m4 (eoshift1): Likewise. * m4/eoshift3.m4 (eoshift3): Likewise. * m4/iforeach.m4: Likewise. * m4/ifunction.m4: Likewise. * m4/ifunction_logical.m4 (name`'rtype_qual`_'atype_code): Likewise. * m4/in_pack.m4 (internal_pack_'rtype_ccode`): Likewise. * m4/matmul.m4 (matmul_'rtype_code`): Likewise. * m4/matmull.m4 (matmul_'rtype_code`): Likewise. * m4/pack.m4 (pack_'rtype_code`): Likewise. * m4/reshape.m4 (reshape_'rtype_ccode`): Likewise. * m4/shape.m4 (shape_'rtype_kind`): Likewise. * m4/spread.m4 (spread_'rtype_code`): Likewise. (spread_scalar_'rtype_code`): Likewise. * m4/transpose.m4 (transpose_'rtype_code`): Likewise. * m4/unpack.m4 (unpack0_'rtype_code`): Likewise. (unpack1_'rtype_code`): Likewise. * runtime/convert_char.c (convert_char1_to_char4): Likewise. (convert_char4_to_char1): Simplify. * runtime/environ.c (init_unformatted): Call xmallocarray instead of xmalloc. * runtime/in_pack_generic.c (internal_pack): Likewise. From-SVN: r211721
102 lines
2.1 KiB
C
102 lines
2.1 KiB
C
/* Memory management routines.
|
|
Copyright (C) 2002-2014 Free Software Foundation, Inc.
|
|
Contributed by Paul Brook <paul@nowt.org>
|
|
|
|
This file is part of the GNU Fortran runtime library (libgfortran).
|
|
|
|
Libgfortran is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 3 of the License, or (at your option) any later version.
|
|
|
|
Libgfortran is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
Under Section 7 of GPL version 3, you are granted additional
|
|
permissions described in the GCC Runtime Library Exception, version
|
|
3.1, as published by the Free Software Foundation.
|
|
|
|
You should have received a copy of the GNU General Public License and
|
|
a copy of the GCC Runtime Library Exception along with this program;
|
|
see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include "libgfortran.h"
|
|
#include <stdlib.h>
|
|
#include <errno.h>
|
|
|
|
#ifndef SIZE_MAX
|
|
#define SIZE_MAX ((size_t)-1)
|
|
#endif
|
|
|
|
|
|
void *
|
|
xmalloc (size_t n)
|
|
{
|
|
void *p;
|
|
|
|
if (n == 0)
|
|
n = 1;
|
|
|
|
p = malloc (n);
|
|
|
|
if (p == NULL)
|
|
os_error ("Memory allocation failed");
|
|
|
|
return p;
|
|
}
|
|
|
|
|
|
void *
|
|
xmallocarray (size_t nmemb, size_t size)
|
|
{
|
|
void *p;
|
|
|
|
if (!nmemb || !size)
|
|
size = nmemb = 1;
|
|
else if (nmemb > SIZE_MAX / size)
|
|
{
|
|
errno = ENOMEM;
|
|
os_error ("Integer overflow in xmallocarray");
|
|
}
|
|
|
|
p = malloc (nmemb * size);
|
|
|
|
if (!p)
|
|
os_error ("Memory allocation failed in xmallocarray");
|
|
|
|
return p;
|
|
}
|
|
|
|
|
|
/* calloc wrapper that aborts on error. */
|
|
|
|
void *
|
|
xcalloc (size_t nmemb, size_t size)
|
|
{
|
|
if (!nmemb || !size)
|
|
nmemb = size = 1;
|
|
|
|
void *p = calloc (nmemb, size);
|
|
if (!p)
|
|
os_error ("Allocating cleared memory failed");
|
|
|
|
return p;
|
|
}
|
|
|
|
|
|
void *
|
|
xrealloc (void *ptr, size_t size)
|
|
{
|
|
if (size == 0)
|
|
size = 1;
|
|
|
|
void *newp = realloc (ptr, size);
|
|
if (!newp)
|
|
os_error ("Memory allocation failure in xrealloc");
|
|
|
|
return newp;
|
|
}
|