[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [SPATCH 2/2] Rewrite malloc/malloca to one avoiding overflows.
|
From: |
Ondřej Bílka |
|
Subject: |
Re: [SPATCH 2/2] Rewrite malloc/malloca to one avoiding overflows. |
|
Date: |
Sun, 3 Nov 2013 22:25:35 +0100 |
|
User-agent: |
Mutt/1.5.20 (2009-06-14) |
On Sun, Nov 03, 2013 at 12:09:27PM -0800, Paul Eggert wrote:
> For something like this, it'd be better to tell us which
> gnulib changes should be made, rather than merely supplying
> a coccinelle recipe. The xalloc.h changes should come first,
> tho.
Here are changes that I obtained by enabling only nmalloc and nrealloc
overwriting.
In several cases I remove a check that nmalloc made duplicate.
For regular expressions a special handling is needed which will come as
separate patch.
2013-11-03 Ondřej Bílka <address@hidden>
* lib/argp-help.c (make_hol, hol_append): Use nmalloc and nrealloc.
* lib/error.c (error_tail): Likewise.
* lib/fchdir.c (ensure_dirs_slot): Likewise.
* lib/file-has-acl.c (file_has_acl): Likewise.
* lib/fnmatch.c (fnmatch): Likewise.
* lib/fts.c (fts_sort): Likewise.
* lib/getgroups.c (rpl_getgroups): Likewise.
* lib/gl_array_list.c (gl_array_nx_create): Likewise.
* lib/gl_carray_list.c (gl_carray_nx_create): Likewise.
* lib/glob.c (glob, glob_in_dir): Likewise.
* lib/glthread/lock.c (gl_waitqueue_add): Likewise.
* lib/group-member.c (get_group_info): Likewise.
* lib/mgetgroups.c (realloc_groupbuf): Likewise.
* lib/putenv.c (putenv): Likewise.
* lib/qcopy-acl.c (qcopy_acl): Likewise.
* lib/qset-acl.c (qset_acl): Likewise.
* lib/regexec.c (build_trtable): Likewise.
* lib/safe-alloc.c (safe_alloc_alloc_n, safe_alloc_realloc_n): Likewise.
* lib/scandir.c (SCANDIR): Likewise.
* lib/setenv.c (__add_to_environ): Likewise.
* lib/spawn_faction_init.c: Likewise.
* lib/uniconv/u16-conv-to-enc.c (FUNC): Likewise.
* lib/unigbrk/ulc-grapheme-breaks.c (ulc_grapheme_breaks): Likewise.
* lib/unilbrk/ulc-possible-linebreaks.c
(ulc_possible_linebreaks): Likewise.
* lib/unilbrk/ulc-width-linebreaks.c (ulc_width_linebreaks): Likewise.
* lib/uninorm/uninorm-filter.c (uninorm_filter_write): Likewise.
* lib/unistr/u16-to-u32.c (FUNC): Likewise.
* lib/unistr/u16-to-u8.c (FUNC): Likewise.
* lib/unistr/u32-to-u16.c (FUNC): Likewise.
* lib/unistr/u32-to-u8.c (FUNC): Likewise.
* lib/unistr/u8-to-u16.c (FUNC): Likewise.
* lib/unistr/u8-to-u32.c (FUNC): Likewise.
* lib/uniwbrk/ulc-wordbreaks.c (ulc_wordbreaks): Likewise.
* lib/vasnprintf.c (multiply, divide, decode_long_double,
decode_double, scale10_round_decimal_decoded): Likewise.
* lib/wait-process.c (register_slave_subprocess): Likewise.
diff --git a/lib/argp-help.c b/lib/argp-help.c
index 85def44..fa04b02 100644
--- a/lib/argp-help.c
+++ b/lib/argp-help.c
@@ -460,7 +460,7 @@ make_hol (const struct argp *argp, struct hol_cluster
*cluster)
num_short_options++; /* This is an upper bound. */
}
- hol->entries = malloc (sizeof (struct hol_entry) * hol->num_entries);
+ hol->entries = nmalloc (sizeof (struct hol_entry), hol->num_entries);
hol->short_options = malloc (num_short_options + 1);
assert (hol->entries && hol->short_options);
@@ -874,7 +874,7 @@ hol_append (struct hol *hol, struct hol *more)
struct hol_entry *e;
unsigned num_entries = hol->num_entries + more->num_entries;
struct hol_entry *entries =
- malloc (num_entries * sizeof (struct hol_entry));
+ nmalloc (num_entries, sizeof (struct hol_entry));
unsigned hol_so_len = strlen (hol->short_options);
char *short_options =
malloc (hol_so_len + strlen (more->short_options) + 1);
diff --git a/lib/error.c b/lib/error.c
index 865b293..9d6aee6 100644
--- a/lib/error.c
+++ b/lib/error.c
@@ -218,8 +218,8 @@ error_tail (int status, int errnum, const char *message,
va_list args)
if (!use_malloc)
wmessage = NULL;
- wchar_t *p = (wchar_t *) realloc (wmessage,
- len * sizeof (wchar_t));
+ wchar_t *p = (wchar_t *) nrealloc (wmessage, len,
+ sizeof (wchar_t));
if (p == NULL)
{
free (wmessage);
diff --git a/lib/fchdir.c b/lib/fchdir.c
index 36a8e35..2aba01c 100644
--- a/lib/fchdir.c
+++ b/lib/fchdir.c
@@ -72,8 +72,8 @@ ensure_dirs_slot (size_t fd)
new_allocated = fd + 1;
new_dirs =
(dirs != NULL
- ? (dir_info_t *) realloc (dirs, new_allocated * sizeof *dirs)
- : (dir_info_t *) malloc (new_allocated * sizeof *dirs));
+ ? (dir_info_t *) nrealloc (dirs, new_allocated, sizeof *dirs)
+ : (dir_info_t *) nmalloc (new_allocated, sizeof *dirs));
if (new_dirs == NULL)
return false;
memset (new_dirs + dirs_allocated, 0,
diff --git a/lib/file-has-acl.c b/lib/file-has-acl.c
index bb8bae1..cf4dc17 100644
--- a/lib/file-has-acl.c
+++ b/lib/file-has-acl.c
@@ -598,7 +598,7 @@ file_has_acl (char const *name, struct stat const *sb)
}
alloc = 2 * alloc; /* <= alloc_max */
entries = malloced =
- (aclent_t *) malloc (alloc * sizeof (aclent_t));
+ (aclent_t *) nmalloc (alloc, sizeof (aclent_t));
if (entries == NULL)
{
errno = ENOMEM;
@@ -673,7 +673,7 @@ file_has_acl (char const *name, struct stat const *sb)
return -1;
}
alloc = 2 * alloc; /* <= alloc_max */
- entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t));
+ entries = malloced = (ace_t *) nmalloc (alloc, sizeof (ace_t));
if (entries == NULL)
{
errno = ENOMEM;
diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index 794d974..1a0ff02 100644
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -307,7 +307,7 @@ fnmatch (const char *pattern, const char *string, int flags)
wpattern = (wchar_t *) alloca (totsize * sizeof (wchar_t));
else
{
- wpattern = malloc (totsize * sizeof (wchar_t));
+ wpattern = nmalloc (totsize, sizeof (wchar_t));
if (__builtin_expect (! wpattern, 0))
{
errno = ENOMEM;
diff --git a/lib/fts.c b/lib/fts.c
index 74968b3..3dab42d 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1870,9 +1870,8 @@ fts_sort (FTS *sp, FTSENT *head, register size_t nitems)
FTSENT **a;
sp->fts_nitems = nitems + 40;
- if (SIZE_MAX / sizeof *a < sp->fts_nitems
- || ! (a = realloc (sp->fts_array,
- sp->fts_nitems * sizeof *a))) {
+ if (!(a = nrealloc (sp->fts_array, sp->fts_nitems,
+ sizeof *a))) {
free(sp->fts_array);
sp->fts_array = NULL;
sp->fts_nitems = 0;
diff --git a/lib/getgroups.c b/lib/getgroups.c
index 9856adc..4ab3a21 100644
--- a/lib/getgroups.c
+++ b/lib/getgroups.c
@@ -69,12 +69,7 @@ rpl_getgroups (int n, gid_t *group)
if (sizeof *group == sizeof *gbuf)
return getgroups (n, (GETGROUPS_T *) group);
- if (SIZE_MAX / sizeof *gbuf <= n)
- {
- errno = ENOMEM;
- return -1;
- }
- gbuf = malloc (n * sizeof *gbuf);
+ gbuf = nmalloc (n, sizeof *gbuf);
if (!gbuf)
return -1;
result = getgroups (n, gbuf);
@@ -96,7 +91,7 @@ rpl_getgroups (int n, gid_t *group)
/* No need to worry about address arithmetic overflow here,
since the ancient systems that we're running on have low
limits on the number of secondary groups. */
- gbuf = malloc (n * sizeof *gbuf);
+ gbuf = nmalloc (n, sizeof *gbuf);
if (!gbuf)
return -1;
n_groups = getgroups (n, gbuf);
diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c
index af5f891..28e4174 100644
--- a/lib/gl_array_list.c
+++ b/lib/gl_array_list.c
@@ -95,9 +95,7 @@ gl_array_nx_create (gl_list_implementation_t implementation,
list->base.allow_duplicates = allow_duplicates;
if (count > 0)
{
- if (size_overflow_p (xtimes (count, sizeof (const void *))))
- goto fail;
- list->elements = (const void **) malloc (count * sizeof (const void *));
+ list->elements = (const void **) nmalloc (count, sizeof (const void *));
if (list->elements == NULL)
goto fail;
memcpy (list->elements, contents, count * sizeof (const void *));
diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c
index 5661b31..21a9f9b 100644
--- a/lib/gl_carray_list.c
+++ b/lib/gl_carray_list.c
@@ -99,9 +99,7 @@ gl_carray_nx_create (gl_list_implementation_t implementation,
list->base.allow_duplicates = allow_duplicates;
if (count > 0)
{
- if (size_overflow_p (xtimes (count, sizeof (const void *))))
- goto fail;
- list->elements = (const void **) malloc (count * sizeof (const void *));
+ list->elements = (const void **) nmalloc (count, sizeof (const void *));
if (list->elements == NULL)
goto fail;
memcpy (list->elements, contents, count * sizeof (const void *));
diff --git a/lib/glob.c b/lib/glob.c
index 7ec066f..1857cd9 100644
--- a/lib/glob.c
+++ b/lib/glob.c
@@ -544,7 +544,7 @@ glob (pattern, flags, errfunc, pglob)
else
{
size_t i;
- pglob->gl_pathv = malloc ((pglob->gl_offs + 1) * sizeof (char *));
+ pglob->gl_pathv = nmalloc ((pglob->gl_offs + 1), sizeof (char *));
if (pglob->gl_pathv == NULL)
return GLOB_NOSPACE;
@@ -807,7 +807,7 @@ glob (pattern, flags, errfunc, pglob)
char **new_gl_pathv;
new_gl_pathv
- = realloc (pglob->gl_pathv, (newcount + 1 + 1) * sizeof (char *));
+ = nrealloc (pglob->gl_pathv, (newcount + 1 + 1), sizeof (char *));
if (new_gl_pathv == NULL)
{
nospace:
@@ -955,8 +955,8 @@ glob (pattern, flags, errfunc, pglob)
int newcount = pglob->gl_pathc + pglob->gl_offs;
char **new_gl_pathv;
- new_gl_pathv = realloc (pglob->gl_pathv,
- (newcount + 2) * sizeof (char *));
+ new_gl_pathv = nrealloc (pglob->gl_pathv, (newcount + 2),
+ sizeof (char *));
if (new_gl_pathv == NULL)
{
globfree (&dirs);
@@ -1471,9 +1471,9 @@ glob_in_dir (const char *pattern, const char *directory,
int flags,
if (nfound != 0)
{
char **new_gl_pathv
- = realloc (pglob->gl_pathv,
- (pglob->gl_pathc + pglob->gl_offs + nfound + 1)
- * sizeof (char *));
+ = nrealloc (pglob->gl_pathv,
+ (pglob->gl_pathc + pglob->gl_offs + nfound + 1),
+ sizeof (char *));
result = 0;
if (new_gl_pathv == NULL)
diff --git a/lib/glthread/lock.c b/lib/glthread/lock.c
index 81908f0..1bc1dfc 100644
--- a/lib/glthread/lock.c
+++ b/lib/glthread/lock.c
@@ -703,7 +703,7 @@ gl_waitqueue_add (gl_waitqueue_t *wq)
{
unsigned int new_alloc = 2 * wq->alloc + 1;
HANDLE *new_array =
- (HANDLE *) realloc (wq->array, new_alloc * sizeof (HANDLE));
+ (HANDLE *) nrealloc (wq->array, new_alloc, sizeof (HANDLE));
if (new_array == NULL)
/* No more memory. */
return INVALID_HANDLE_VALUE;
diff --git a/lib/group-member.c b/lib/group-member.c
index da01584..0f90909 100644
--- a/lib/group-member.c
+++ b/lib/group-member.c
@@ -53,10 +53,9 @@ get_group_info (struct group_info *gi)
if (n_groups < 0)
{
int n_group_slots = getgroups (0, NULL);
- if (0 <= n_group_slots
- && ! xalloc_oversized (n_group_slots, sizeof *gi->group))
+ if (0 <= n_group_slots)
{
- gi->group = malloc (n_group_slots * sizeof *gi->group);
+ gi->group = nmalloc (n_group_slots, sizeof *gi->group);
if (gi->group)
n_groups = getgroups (n_group_slots, gi->group);
}
diff --git a/lib/mgetgroups.c b/lib/mgetgroups.c
index 2d82f45..cb3cb56 100644
--- a/lib/mgetgroups.c
+++ b/lib/mgetgroups.c
@@ -42,7 +42,7 @@ realloc_groupbuf (gid_t *g, size_t num)
return NULL;
}
- return realloc (g, num * sizeof *g);
+ return nrealloc (g, num, sizeof *g);
}
/* Like getugroups, but store the result in malloc'd storage.
diff --git a/lib/putenv.c b/lib/putenv.c
index 5461273..5b7096b 100644
--- a/lib/putenv.c
+++ b/lib/putenv.c
@@ -179,7 +179,7 @@ putenv (char *string)
{
static char **last_environ = NULL;
size_t size = ep - environ;
- char **new_environ = malloc ((size + 2) * sizeof *new_environ);
+ char **new_environ = nmalloc ((size + 2), sizeof *new_environ);
if (! new_environ)
return -1;
new_environ[0] = string;
diff --git a/lib/qcopy-acl.c b/lib/qcopy-acl.c
index 25a2ff1..58b02eb 100644
--- a/lib/qcopy-acl.c
+++ b/lib/qcopy-acl.c
@@ -225,7 +225,7 @@ qcopy_acl (const char *src_name, int source_desc, const
char *dst_name,
break;
}
- ace_entries = (ace_t *) malloc (ace_count * sizeof (ace_t));
+ ace_entries = (ace_t *) nmalloc (ace_count, sizeof (ace_t));
if (ace_entries == NULL)
{
errno = ENOMEM;
@@ -278,7 +278,7 @@ qcopy_acl (const char *src_name, int source_desc, const
char *dst_name,
break;
}
- entries = (aclent_t *) malloc (count * sizeof (aclent_t));
+ entries = (aclent_t *) nmalloc (count, sizeof (aclent_t));
if (entries == NULL)
{
errno = ENOMEM;
diff --git a/lib/qset-acl.c b/lib/qset-acl.c
index 7bde2c1..6398ec3 100644
--- a/lib/qset-acl.c
+++ b/lib/qset-acl.c
@@ -232,7 +232,7 @@ qset_acl (char const *name, int desc, mode_t mode)
return -1;
}
alloc = 2 * alloc; /* <= alloc_max */
- entries = malloced = (ace_t *) malloc (alloc * sizeof (ace_t));
+ entries = malloced = (ace_t *) nmalloc (alloc, sizeof (ace_t));
if (entries == NULL)
{
errno = ENOMEM;
diff --git a/lib/regexec.c b/lib/regexec.c
index 21d14ad..d9b284a 100644
--- a/lib/regexec.c
+++ b/lib/regexec.c
@@ -3425,7 +3425,7 @@ build_trtable (const re_dfa_t *dfa, re_dfastate_t *state)
else
{
dest_states = (re_dfastate_t **)
- malloc (ndests * 3 * sizeof (re_dfastate_t *));
+ nmalloc (ndests * 3, sizeof (re_dfastate_t *));
if (BE (dest_states == NULL, 0))
{
out_free:
diff --git a/lib/safe-alloc.c b/lib/safe-alloc.c
index 510e06b..4a83fde 100644
--- a/lib/safe-alloc.c
+++ b/lib/safe-alloc.c
@@ -68,16 +68,10 @@ safe_alloc_alloc_n (void *ptrptr, size_t size, size_t
count, int zeroed)
return 0;
}
- if (safe_alloc_oversized (count, size))
- {
- errno = ENOMEM;
- return -1;
- }
-
if (zeroed)
*(void **) ptrptr = calloc (count, size);
else
- *(void **) ptrptr = malloc (count * size);
+ *(void **) ptrptr = nmalloc (count, size);
if (*(void **) ptrptr == NULL)
return -1;
@@ -108,12 +102,8 @@ safe_alloc_realloc_n (void *ptrptr, size_t size, size_t
count)
*(void **) ptrptr = NULL;
return 0;
}
- if (safe_alloc_oversized (count, size))
- {
- errno = ENOMEM;
- return -1;
- }
- tmp = realloc (*(void **) ptrptr, size * count);
+
+ tmp = nrealloc (*(void **) ptrptr, size, count);
if (!tmp)
return -1;
*(void **) ptrptr = tmp;
diff --git a/lib/scandir.c b/lib/scandir.c
index eccbc74..8b78b54 100644
--- a/lib/scandir.c
+++ b/lib/scandir.c
@@ -142,7 +142,7 @@ SCANDIR (const char *dir,
vsize = 10;
else
vsize *= 2;
- new = (DIRENT_TYPE **) realloc (v, vsize * sizeof (*v));
+ new = (DIRENT_TYPE **) nrealloc (v, vsize, sizeof (*v));
if (new == NULL)
break;
v = new;
diff --git a/lib/setenv.c b/lib/setenv.c
index 995a0f2..bc0bf64 100644
--- a/lib/setenv.c
+++ b/lib/setenv.c
@@ -144,8 +144,8 @@ __add_to_environ (const char *name, const char *value,
const char *combined,
/* We allocated this space; we can extend it. */
new_environ =
(char **) (last_environ == NULL
- ? malloc ((size + 2) * sizeof (char *))
- : realloc (last_environ, (size + 2) * sizeof (char *)));
+ ? nmalloc ((size + 2), sizeof (char *))
+ : nrealloc (last_environ, (size + 2), sizeof (char *)));
if (new_environ == NULL)
{
/* It's easier to set errno to ENOMEM than to rely on the
diff --git a/lib/spawn_faction_init.c b/lib/spawn_faction_init.c
index cf1d0a6..e108c64 100644
--- a/lib/spawn_faction_init.c
+++ b/lib/spawn_faction_init.c
@@ -32,8 +32,8 @@ int
__posix_spawn_file_actions_realloc (posix_spawn_file_actions_t *file_actions)
{
int newalloc = file_actions->_allocated + 8;
- void *newmem = realloc (file_actions->_actions,
- newalloc * sizeof (struct __spawn_action));
+ void *newmem = nrealloc (file_actions->_actions, newalloc,
+ sizeof (struct __spawn_action));
if (newmem == NULL)
/* Not enough memory. */
diff --git a/lib/uniconv/u16-conv-to-enc.c b/lib/uniconv/u16-conv-to-enc.c
index d4c0665..6867f4c 100644
--- a/lib/uniconv/u16-conv-to-enc.c
+++ b/lib/uniconv/u16-conv-to-enc.c
@@ -109,10 +109,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 6 > allocated)
allocated = length + 6;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -150,7 +150,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unigbrk/ulc-grapheme-breaks.c
b/lib/unigbrk/ulc-grapheme-breaks.c
index d9d2f5c..02f8ebf 100644
--- a/lib/unigbrk/ulc-grapheme-breaks.c
+++ b/lib/unigbrk/ulc-grapheme-breaks.c
@@ -80,7 +80,7 @@ ulc_grapheme_breaks (const char *s, size_t n, char *p)
{
/* Convert the string to UTF-8 and build a translation table
from offsets into s to offsets into the translated string. */
- size_t *offsets = (size_t *) malloc (n * sizeof (size_t));
+ size_t *offsets = (size_t *) nmalloc (n, sizeof (size_t));
if (offsets != NULL)
{
diff --git a/lib/unilbrk/ulc-possible-linebreaks.c
b/lib/unilbrk/ulc-possible-linebreaks.c
index 41daddd..8684326 100644
--- a/lib/unilbrk/ulc-possible-linebreaks.c
+++ b/lib/unilbrk/ulc-possible-linebreaks.c
@@ -52,7 +52,7 @@ ulc_possible_linebreaks (const char *s, size_t n, const char
*encoding,
{
/* Convert the string to UTF-8 and build a translation table
from offsets into s to offsets into the translated string. */
- size_t *offsets = (size_t *) malloc (n * sizeof (size_t));
+ size_t *offsets = (size_t *) nmalloc (n, sizeof (size_t));
if (offsets != NULL)
{
diff --git a/lib/unilbrk/ulc-width-linebreaks.c
b/lib/unilbrk/ulc-width-linebreaks.c
index e39f853..95ec686 100644
--- a/lib/unilbrk/ulc-width-linebreaks.c
+++ b/lib/unilbrk/ulc-width-linebreaks.c
@@ -54,7 +54,7 @@ ulc_width_linebreaks (const char *s, size_t n,
{
/* Convert the string to UTF-8 and build a translation table
from offsets into s to offsets into the translated string. */
- size_t *offsets = (size_t *) malloc (n * sizeof (size_t));
+ size_t *offsets = (size_t *) nmalloc (n, sizeof (size_t));
if (offsets != NULL)
{
diff --git a/lib/uninorm/uninorm-filter.c b/lib/uninorm/uninorm-filter.c
index 2559cc9..fd1f886 100644
--- a/lib/uninorm/uninorm-filter.c
+++ b/lib/uninorm/uninorm-filter.c
@@ -240,7 +240,8 @@ uninorm_filter_write (struct uninorm_filter *filter, ucs4_t
uc_arg)
abort ();
new_sortbuf =
(struct ucs4_with_ccc *)
- malloc (2 * filter->sortbuf_allocated * sizeof (struct
ucs4_with_ccc));
+ nmalloc (2 * filter->sortbuf_allocated,
+ sizeof (struct ucs4_with_ccc));
if (new_sortbuf == NULL)
{
/* errno is ENOMEM. */
diff --git a/lib/unistr/u16-to-u32.c b/lib/unistr/u16-to-u32.c
index d279f6a..067f85c 100644
--- a/lib/unistr/u16-to-u32.c
+++ b/lib/unistr/u16-to-u32.c
@@ -77,10 +77,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 1 > allocated)
allocated = length + 1;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -115,7 +115,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unistr/u16-to-u8.c b/lib/unistr/u16-to-u8.c
index c589727..93bd5f9 100644
--- a/lib/unistr/u16-to-u8.c
+++ b/lib/unistr/u16-to-u8.c
@@ -85,10 +85,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 6 > allocated)
allocated = length + 6;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -126,7 +126,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unistr/u32-to-u16.c b/lib/unistr/u32-to-u16.c
index cf24783..dbb3a4f 100644
--- a/lib/unistr/u32-to-u16.c
+++ b/lib/unistr/u32-to-u16.c
@@ -79,10 +79,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 2 > allocated)
allocated = length + 2;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -120,7 +120,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unistr/u32-to-u8.c b/lib/unistr/u32-to-u8.c
index 702279f..5769db0 100644
--- a/lib/unistr/u32-to-u8.c
+++ b/lib/unistr/u32-to-u8.c
@@ -79,10 +79,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 6 > allocated)
allocated = length + 6;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -120,7 +120,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unistr/u8-to-u16.c b/lib/unistr/u8-to-u16.c
index 528d463..2df138e 100644
--- a/lib/unistr/u8-to-u16.c
+++ b/lib/unistr/u8-to-u16.c
@@ -85,10 +85,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 2 > allocated)
allocated = length + 2;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -126,7 +126,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/unistr/u8-to-u32.c b/lib/unistr/u8-to-u32.c
index cbd0b9e..7c3be02 100644
--- a/lib/unistr/u8-to-u32.c
+++ b/lib/unistr/u8-to-u32.c
@@ -77,10 +77,10 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
if (length + 1 > allocated)
allocated = length + 1;
if (result == resultbuf || result == NULL)
- memory = (DST_UNIT *) malloc (allocated * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nmalloc (allocated, sizeof (DST_UNIT));
else
memory =
- (DST_UNIT *) realloc (result, allocated * sizeof (DST_UNIT));
+ (DST_UNIT *) nrealloc (result, allocated, sizeof (DST_UNIT));
if (memory == NULL)
{
@@ -115,7 +115,7 @@ FUNC (const SRC_UNIT *s, size_t n, DST_UNIT *resultbuf,
size_t *lengthp)
/* Shrink the allocated memory if possible. */
DST_UNIT *memory;
- memory = (DST_UNIT *) realloc (result, length * sizeof (DST_UNIT));
+ memory = (DST_UNIT *) nrealloc (result, length, sizeof (DST_UNIT));
if (memory != NULL)
result = memory;
}
diff --git a/lib/uniwbrk/ulc-wordbreaks.c b/lib/uniwbrk/ulc-wordbreaks.c
index 17d06ad..e5702c8 100644
--- a/lib/uniwbrk/ulc-wordbreaks.c
+++ b/lib/uniwbrk/ulc-wordbreaks.c
@@ -54,7 +54,7 @@ ulc_wordbreaks (const char *s, size_t n, char *p)
{
/* Convert the string to UTF-8 and build a translation table
from offsets into s to offsets into the translated string. */
- size_t *offsets = (size_t *) malloc (n * sizeof (size_t));
+ size_t *offsets = (size_t *) nmalloc (n, sizeof (size_t));
if (offsets != NULL)
{
diff --git a/lib/vasnprintf.c b/lib/vasnprintf.c
index 21f9169..4c0da59 100644
--- a/lib/vasnprintf.c
+++ b/lib/vasnprintf.c
@@ -376,7 +376,7 @@ multiply (mpn_t src1, mpn_t src2, mpn_t *dest)
size_t k, i, j;
dlen = len1 + len2;
- dp = (mp_limb_t *) malloc (dlen * sizeof (mp_limb_t));
+ dp = (mp_limb_t *) nmalloc (dlen, sizeof (mp_limb_t));
if (dp == NULL)
return NULL;
for (k = len2; k > 0; )
@@ -479,7 +479,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
/* Allocate room for a_len+2 digits.
(Need a_len+1 digits for the real division and 1 more digit for the
final rounding of q.) */
- roomptr = (mp_limb_t *) malloc ((a_len + 2) * sizeof (mp_limb_t));
+ roomptr = (mp_limb_t *) nmalloc ((a_len + 2), sizeof (mp_limb_t));
if (roomptr == NULL)
return NULL;
@@ -612,7 +612,7 @@ divide (mpn_t a, mpn_t b, mpn_t *q)
Copy b, shifting it left by s bits. */
if (s > 0)
{
- tmp_roomptr = (mp_limb_t *) malloc (b_len * sizeof (mp_limb_t));
+ tmp_roomptr = (mp_limb_t *) nmalloc (b_len, sizeof (mp_limb_t));
if (tmp_roomptr == NULL)
{
free (roomptr);
@@ -906,7 +906,7 @@ decode_long_double (long double x, int *ep, mpn_t *mp)
/* Allocate memory for result. */
m.nlimbs = (LDBL_MANT_BIT + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS;
- m.limbs = (mp_limb_t *) malloc (m.nlimbs * sizeof (mp_limb_t));
+ m.limbs = (mp_limb_t *) nmalloc (m.nlimbs, sizeof (mp_limb_t));
if (m.limbs == NULL)
return NULL;
/* Split into exponential part and mantissa. */
@@ -994,7 +994,7 @@ decode_double (double x, int *ep, mpn_t *mp)
/* Allocate memory for result. */
m.nlimbs = (DBL_MANT_BIT + GMP_LIMB_BITS - 1) / GMP_LIMB_BITS;
- m.limbs = (mp_limb_t *) malloc (m.nlimbs * sizeof (mp_limb_t));
+ m.limbs = (mp_limb_t *) nmalloc (m.nlimbs, sizeof (mp_limb_t));
if (m.limbs == NULL)
return NULL;
/* Split into exponential part and mantissa. */
@@ -1105,9 +1105,9 @@ scale10_round_decimal_decoded (int e, mpn_t m, void
*memory, int n)
sign. 2.322 is slightly larger than log(5)/log(2). */
abs_n = (n >= 0 ? n : -n);
abs_s = (s >= 0 ? s : -s);
- pow5_ptr = (mp_limb_t *) malloc (((int)(abs_n * (2.322f / GMP_LIMB_BITS)) + 1
- + abs_s / GMP_LIMB_BITS + 1)
- * sizeof (mp_limb_t));
+ pow5_ptr = (mp_limb_t *) nmalloc (((int)(abs_n * (2.322f / GMP_LIMB_BITS))
+ + 1 + abs_s / GMP_LIMB_BITS + 1),
+ sizeof (mp_limb_t));
if (pow5_ptr == NULL)
{
free (memory);
@@ -1228,8 +1228,8 @@ scale10_round_decimal_decoded (int e, mpn_t m, void
*memory, int n)
Multiply m with 2^s, then divide by pow5. */
mpn_t numerator;
mp_limb_t *num_ptr;
- num_ptr = (mp_limb_t *) malloc ((m.nlimbs + s_limbs + 1)
- * sizeof (mp_limb_t));
+ num_ptr = (mp_limb_t *) nmalloc ((m.nlimbs + s_limbs + 1),
+ sizeof (mp_limb_t));
if (num_ptr == NULL)
{
free (pow5_ptr);
diff --git a/lib/wait-process.c b/lib/wait-process.c
index 17a2430..e4b350a 100644
--- a/lib/wait-process.c
+++ b/lib/wait-process.c
@@ -144,7 +144,7 @@ register_slave_subprocess (pid_t child)
size_t new_slaves_allocated = 2 * slaves_allocated;
slaves_entry_t *new_slaves =
(slaves_entry_t *)
- malloc (new_slaves_allocated * sizeof (slaves_entry_t));
+ nmalloc (new_slaves_allocated, sizeof (slaves_entry_t));
if (new_slaves == NULL)
{
/* xalloc_die() will call exit() which will invoke cleanup_slaves().