diff options
| author | pfg <pfg@FreeBSD.org> | 2016-10-09 20:07:01 +0000 |
|---|---|---|
| committer | pfg <pfg@FreeBSD.org> | 2016-10-09 20:07:01 +0000 |
| commit | dd0ffa43a048719e3fb76d3604733fa58a102c65 (patch) | |
| tree | 3efc1772c788b5e503451e94728539855f5afd47 /usr.bin | |
| parent | 98e94dcafffe108b0dc9b9377f28fade01c137da (diff) | |
| download | FreeBSD-src-dd0ffa43a048719e3fb76d3604733fa58a102c65.zip FreeBSD-src-dd0ffa43a048719e3fb76d3604733fa58a102c65.tar.gz | |
MFC r305813:
localedef(1): make better use of calloc(3) arguments.
The first argument of calloc(3) should be an ordinal type, and the
second a size: split a multiplication to make better use of calloc(3)
and detect overflows.
Do some other re-ordering and style fixes while here.
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/localedef/collate.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index 0eb6ea1..63dd4c7 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -1204,7 +1204,7 @@ dump_collate(void) subst_t *temp; RB_COUNT(temp, substs, &substs[i], n); collinfo.subst_count[i] = n; - if ((st = calloc(sizeof (collate_subst_t) * n, 1)) == NULL) { + if ((st = calloc(n, sizeof(collate_subst_t))) == NULL) { fprintf(stderr, "out of memory"); return; } @@ -1233,7 +1233,7 @@ dump_collate(void) */ RB_NUMNODES(collelem_t, elem_by_expand, &elem_by_expand, collinfo.chain_count); - chain = calloc(sizeof (collate_chain_t), collinfo.chain_count); + chain = calloc(collinfo.chain_count, sizeof(collate_chain_t)); if (chain == NULL) { fprintf(stderr, "out of memory"); return; @@ -1253,7 +1253,7 @@ dump_collate(void) * Large (> UCHAR_MAX) character priorities */ RB_NUMNODES(collchar_t, collchars, &collchars, n); - large = calloc(n, sizeof (collate_large_t)); + large = calloc(n, sizeof(collate_large_t)); if (large == NULL) { fprintf(stderr, "out of memory"); return; |
