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

Fix an off by one due to bad conversion from avl(3) to tree(3)

Browse Source 
Readd calloc as it was not the issue just the messenger

Submitted by:	dim
Found by:	Address Sanitizer
This commit is contained in:
Baptiste Daroussin 2015-11-07 19:54:40 +00:00
parent 277911a38e
commit 5d21db0905
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1242,11 +1242,11 @@ dump_collate(void)
}
n = 0;
RB_FOREACH(ce, elem_by_expand, &elem_by_expand) {
n++;
(void) wsncpy(chain[n].str, ce->expand, COLLATE_STR_LEN);
for (i = 0; i < NUM_WT; i++) {
chain[n].pri[i] = get_weight(ce->ref[i], i);
}
n++;
}
if (n != collinfo.chain_count)
INTERR;
@ -1255,12 +1255,11 @@ dump_collate(void)
* Large (> UCHAR_MAX) character priorities
*/
RB_NUMNODES(collchar_t, collchars, &collchars, n);
large = malloc(sizeof (collate_large_t) * n);
large = calloc(n, sizeof (collate_large_t));
if (large == NULL) {
fprintf(stderr, "out of memory");
return;
}
memset(large, 0, sizeof (collate_large_t) * n);
i = 0;
RB_FOREACH(cc, collchars, &collchars) {