Date: Sun, 9 Oct 2016 20:07:01 +0000 (UTC) From: "Pedro F. Giffuni" <pfg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r306912 - stable/11/usr.bin/localedef Message-ID: <201610092007.u99K71vB090464@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: pfg Date: Sun Oct 9 20:07:01 2016 New Revision: 306912 URL: https://svnweb.freebsd.org/changeset/base/306912 Log: 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. Modified: stable/11/usr.bin/localedef/collate.c Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/localedef/collate.c ============================================================================== --- stable/11/usr.bin/localedef/collate.c Sun Oct 9 19:59:20 2016 (r306911) +++ stable/11/usr.bin/localedef/collate.c Sun Oct 9 20:07:01 2016 (r306912) @@ -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;
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610092007.u99K71vB090464>