svn commit: r290499 - head/usr.bin/localedef

Joerg Sonnenberger joerg at britannica.bec.de
Sat Nov 7 16:26:22 UTC 2015


On Sat, Nov 07, 2015 at 04:22:29PM +0000, Baptiste Daroussin wrote:
> Author: bapt
> Date: Sat Nov  7 16:22:29 2015
> New Revision: 290499
> URL: https://svnweb.freebsd.org/changeset/base/290499
> 
> Log:
>   Workaround an issue on i386 to unbreak the build until the real issue is tracked
>   down
> 
> Modified:
>   head/usr.bin/localedef/collate.c
> 
> Modified: head/usr.bin/localedef/collate.c
> ==============================================================================
> --- head/usr.bin/localedef/collate.c	Sat Nov  7 15:03:45 2015	(r290498)
> +++ head/usr.bin/localedef/collate.c	Sat Nov  7 16:22:29 2015	(r290499)
> @@ -1255,7 +1255,8 @@ dump_collate(void)
>  	 * Large (> UCHAR_MAX) character priorities
>  	 */
>  	RB_NUMNODES(collchar_t, collchars, &collchars, n);
> -	large = calloc(sizeof (collate_large_t) * n, 1);
> +	large = malloc(sizeof (collate_large_t) * n);
> +	memset(large, 0, sizeof (collate_large_t) * n);
>  	if (large == NULL) {
>  		fprintf(stderr, "out of memory");
>  		return;

Why was this not calloc(sizeof(), n) in first place?!

Joerg


More information about the svn-src-all mailing list