d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

localedef(1): make better use of calloc(3) arguments.

Browse Source 
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
This commit is contained in:
Pedro F. Giffuni 2016-09-14 16:47:17 +00:00
parent 60e600c8fc
commit be4391a2d5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
usr.bin/localedef/collate.c
View File

@ -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;