]> xenbits.xensource.com Git - people/liuw/freebsd.git/commitdiff
Run memset only after having checked the return of malloc
authorbapt <bapt@FreeBSD.org>
Sat, 7 Nov 2015 16:45:51 +0000 (16:45 +0000)
committerbapt <bapt@FreeBSD.org>
Sat, 7 Nov 2015 16:45:51 +0000 (16:45 +0000)
Submitted by: pluknet

usr.bin/localedef/collate.c

index 5a31a75bac5011d4e5cc2f0aa446b1b169c05cdc..3216d21dbcebbe9049501cb27cddb93da005020e 100644 (file)
@@ -1256,11 +1256,11 @@ dump_collate(void)
         */
        RB_NUMNODES(collchar_t, collchars, &collchars, n);
        large = malloc(sizeof (collate_large_t) * n);
-       memset(large, 0, sizeof (collate_large_t) * n);
        if (large == NULL) {
                fprintf(stderr, "out of memory");
                return;
        }
+       memset(large, 0, sizeof (collate_large_t) * n);
 
        i = 0;
        RB_FOREACH(cc, collchars, &collchars) {