Author: pfg
Date: Wed Sep 14 16:47:17 2016
New Revision: 305813
URL: https://svnweb.freebsd.org/changeset/base/305813
Log:
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.
MFC after: 3 weeks
Modified:
head/usr.bin/localedef/collate.c
Modified: head/usr.bin/localedef/collate.c
==============================================================================
--- head/usr.bin/localedef/collate.c Wed Sep 14 16:34:52 2016
(r305812)
+++ head/usr.bin/localedef/collate.c Wed Sep 14 16:47:17 2016
(r305813)
@@ -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;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
