aboutsummaryrefslogtreecommitdiffstats
path: root/gcc-4.9/libgfortran/intrinsics
diff options
context:
space:
mode:
Diffstat (limited to 'gcc-4.9/libgfortran/intrinsics')
-rw-r--r--gcc-4.9/libgfortran/intrinsics/cshift0.c4
-rw-r--r--gcc-4.9/libgfortran/intrinsics/eoshift0.c4
-rw-r--r--gcc-4.9/libgfortran/intrinsics/eoshift2.c4
-rw-r--r--gcc-4.9/libgfortran/intrinsics/pack_generic.c6
-rw-r--r--gcc-4.9/libgfortran/intrinsics/reshape_generic.c6
-rw-r--r--gcc-4.9/libgfortran/intrinsics/spread_generic.c4
-rw-r--r--gcc-4.9/libgfortran/intrinsics/string_intrinsics_inc.c4
-rw-r--r--gcc-4.9/libgfortran/intrinsics/transpose_generic.c2
-rw-r--r--gcc-4.9/libgfortran/intrinsics/unpack_generic.c2
9 files changed, 18 insertions, 18 deletions
diff --git a/gcc-4.9/libgfortran/intrinsics/cshift0.c b/gcc-4.9/libgfortran/intrinsics/cshift0.c
index 12f828927..f983754f1 100644
--- a/gcc-4.9/libgfortran/intrinsics/cshift0.c
+++ b/gcc-4.9/libgfortran/intrinsics/cshift0.c
@@ -79,8 +79,8 @@ cshift0 (gfc_array_char * ret, const gfc_array_char * array,
GFC_DIMENSION_SET(ret->dim[i], 0, ub, str);
}
- /* xmalloc allocates a single byte for zero size. */
- ret->base_addr = xmalloc (size * arraysize);
+ /* xmallocarray allocates a single byte for zero size. */
+ ret->base_addr = xmallocarray (arraysize, size);
}
else if (unlikely (compile_options.bounds_check))
{
diff --git a/gcc-4.9/libgfortran/intrinsics/eoshift0.c b/gcc-4.9/libgfortran/intrinsics/eoshift0.c
index 1857ab065..7d3721320 100644
--- a/gcc-4.9/libgfortran/intrinsics/eoshift0.c
+++ b/gcc-4.9/libgfortran/intrinsics/eoshift0.c
@@ -86,8 +86,8 @@ eoshift0 (gfc_array_char * ret, const gfc_array_char * array,
}
- /* xmalloc allocates a single byte for zero size. */
- ret->base_addr = xmalloc (size * arraysize);
+ /* xmallocarray allocates a single byte for zero size. */
+ ret->base_addr = xmallocarray (arraysize, size);
}
else if (unlikely (compile_options.bounds_check))
{
diff --git a/gcc-4.9/libgfortran/intrinsics/eoshift2.c b/gcc-4.9/libgfortran/intrinsics/eoshift2.c
index ed264920d..c7ec5cf9f 100644
--- a/gcc-4.9/libgfortran/intrinsics/eoshift2.c
+++ b/gcc-4.9/libgfortran/intrinsics/eoshift2.c
@@ -78,8 +78,8 @@ eoshift2 (gfc_array_char *ret, const gfc_array_char *array,
ret->offset = 0;
ret->dtype = array->dtype;
- /* xmalloc allocates a single byte for zero size. */
- ret->base_addr = xmalloc (size * arraysize);
+ /* xmallocarray allocates a single byte for zero size. */
+ ret->base_addr = xmallocarray (arraysize, size);
for (i = 0; i < GFC_DESCRIPTOR_RANK (array); i++)
{
diff --git a/gcc-4.9/libgfortran/intrinsics/pack_generic.c b/gcc-4.9/libgfortran/intrinsics/pack_generic.c
index 9924223b3..3fbfa0aaa 100644
--- a/gcc-4.9/libgfortran/intrinsics/pack_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/pack_generic.c
@@ -152,8 +152,8 @@ pack_internal (gfc_array_char *ret, const gfc_array_char *array,
GFC_DIMENSION_SET(ret->dim[0], 0, total-1, 1);
ret->offset = 0;
- /* xmalloc allocates a single byte for zero size. */
- ret->base_addr = xmalloc (size * total);
+ /* xmallocarray allocates a single byte for zero size. */
+ ret->base_addr = xmallocarray (total, size);
if (total == 0)
return; /* In this case, nothing remains to be done. */
@@ -519,7 +519,7 @@ pack_s_internal (gfc_array_char *ret, const gfc_array_char *array,
ret->offset = 0;
- ret->base_addr = xmalloc (size * total);
+ ret->base_addr = xmallocarray (total, size);
if (total == 0)
return;
diff --git a/gcc-4.9/libgfortran/intrinsics/reshape_generic.c b/gcc-4.9/libgfortran/intrinsics/reshape_generic.c
index 3b2e99487..f742051b5 100644
--- a/gcc-4.9/libgfortran/intrinsics/reshape_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/reshape_generic.c
@@ -99,11 +99,11 @@ reshape_internal (parray *ret, parray *source, shape_type *shape,
ret->offset = 0;
if (unlikely (rs < 1))
- alloc_size = 1;
+ alloc_size = 0; /* xmalloc will allocate 1 byte. */
else
- alloc_size = rs * size;
+ alloc_size = rs;
- ret->base_addr = xmalloc (alloc_size);
+ ret->base_addr = xmallocarray (alloc_size, size);
ret->dtype = (source->dtype & ~GFC_DTYPE_RANK_MASK) | rdim;
}
diff --git a/gcc-4.9/libgfortran/intrinsics/spread_generic.c b/gcc-4.9/libgfortran/intrinsics/spread_generic.c
index 0fe5722f1..f3f23b8ce 100644
--- a/gcc-4.9/libgfortran/intrinsics/spread_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/spread_generic.c
@@ -100,7 +100,7 @@ spread_internal (gfc_array_char *ret, const gfc_array_char *source,
GFC_DIMENSION_SET(ret->dim[n], 0, ub, stride);
}
ret->offset = 0;
- ret->base_addr = xmalloc (rs * size);
+ ret->base_addr = xmallocarray (rs, size);
if (rs <= 0)
return;
@@ -245,7 +245,7 @@ spread_internal_scalar (gfc_array_char *ret, const char *source,
if (ret->base_addr == NULL)
{
- ret->base_addr = xmalloc (ncopies * size);
+ ret->base_addr = xmallocarray (ncopies, size);
ret->offset = 0;
GFC_DIMENSION_SET(ret->dim[0], 0, ncopies - 1, 1);
}
diff --git a/gcc-4.9/libgfortran/intrinsics/string_intrinsics_inc.c b/gcc-4.9/libgfortran/intrinsics/string_intrinsics_inc.c
index 84182af18..5c50366f3 100644
--- a/gcc-4.9/libgfortran/intrinsics/string_intrinsics_inc.c
+++ b/gcc-4.9/libgfortran/intrinsics/string_intrinsics_inc.c
@@ -164,7 +164,7 @@ string_trim (gfc_charlen_type *len, CHARTYPE **dest, gfc_charlen_type slen,
else
{
/* Allocate space for result string. */
- *dest = xmalloc (*len * sizeof (CHARTYPE));
+ *dest = xmallocarray (*len, sizeof (CHARTYPE));
/* Copy string if necessary. */
memcpy (*dest, src, *len * sizeof (CHARTYPE));
@@ -442,7 +442,7 @@ string_minmax (gfc_charlen_type *rlen, CHARTYPE **dest, int op, int nargs, ...)
*dest = &zero_length_string;
else
{
- CHARTYPE *tmp = xmalloc (*rlen * sizeof (CHARTYPE));
+ CHARTYPE *tmp = xmallocarray (*rlen, sizeof (CHARTYPE));
memcpy (tmp, res, reslen * sizeof (CHARTYPE));
MEMSET (&tmp[reslen], ' ', *rlen - reslen);
*dest = tmp;
diff --git a/gcc-4.9/libgfortran/intrinsics/transpose_generic.c b/gcc-4.9/libgfortran/intrinsics/transpose_generic.c
index 5ee12ee10..a5e2947a6 100644
--- a/gcc-4.9/libgfortran/intrinsics/transpose_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/transpose_generic.c
@@ -60,7 +60,7 @@ transpose_internal (gfc_array_char *ret, gfc_array_char *source)
GFC_DIMENSION_SET(ret->dim[1], 0, GFC_DESCRIPTOR_EXTENT(source,0) - 1,
GFC_DESCRIPTOR_EXTENT(source, 1));
- ret->base_addr = xmalloc (size * size0 ((array_t*)ret));
+ ret->base_addr = xmallocarray (size0 ((array_t*)ret), size);
ret->offset = 0;
}
else if (unlikely (compile_options.bounds_check))
diff --git a/gcc-4.9/libgfortran/intrinsics/unpack_generic.c b/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
index 5d12cc11c..4bd99278e 100644
--- a/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
+++ b/gcc-4.9/libgfortran/intrinsics/unpack_generic.c
@@ -125,7 +125,7 @@ unpack_internal (gfc_array_char *ret, const gfc_array_char *vector,
rs *= extent[n];
}
ret->offset = 0;
- ret->base_addr = xmalloc (rs * size);
+ ret->base_addr = xmallocarray (rs, size);
}
else
{
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 10:18:44 +0000