diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-11-07 19:54:40 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2015-11-07 19:54:40 +0000 |
| commit | 5d21db0905b00871753ff80051b837559d092708 (patch) | |
| tree | 8c9a9d2bc5dadd3ed4d537ecea2e56078dc68e4f /usr.bin/localedef | |
| parent | 277911a38e7560ed8b7bcc38247c578a7ff33c51 (diff) | |
| download | src-test2-5d21db0905b00871753ff80051b837559d092708.tar.gz src-test2-5d21db0905b00871753ff80051b837559d092708.zip | |
Notes
Diffstat (limited to 'usr.bin/localedef')
| -rw-r--r-- | usr.bin/localedef/collate.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index 3216d21dbceb..7e64e6a1f623 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -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) { |