From owner-svn-src-all@freebsd.org Sat Nov 7 16:26:22 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D823AA28611 for ; Sat, 7 Nov 2015 16:26:22 +0000 (UTC) (envelope-from joerg@britannica.bec.de) Received: from mo6-p00-ob.smtp.rzone.de (mo6-p00-ob.smtp.rzone.de [IPv6:2a01:238:20a:202:5300::2]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.smtp.rzone.de", Issuer "TeleSec ServerPass DE-2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 747321CBA for ; Sat, 7 Nov 2015 16:26:22 +0000 (UTC) (envelope-from joerg@britannica.bec.de) X-RZG-AUTH: :JiIXek6mfvEEUpFQdo7Fj1/zg48CFjWjQuEfXeSt/nWoxdY2dvuAIbsw5PvjGQjhXhvF+2y5skp9poAHtmlBymoI0K8fJw== X-RZG-CLASS-ID: mo00 Received: from britannica.bec.de (p20030057E21B0F04D49C3C7CAF3F6021.dip0.t-ipconnect.de [IPv6:2003:57:e21b:f04:d49c:3c7c:af3f:6021]) by smtp.strato.de (RZmta 37.14 AUTH) with ESMTPSA id u0393drA7GQIUJu (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (curve secp521r1 with 521 ECDH bits, eq. 15360 bits RSA)) (Client did not present a certificate) for ; Sat, 7 Nov 2015 17:26:18 +0100 (CET) Date: Sat, 7 Nov 2015 17:26:17 +0100 From: Joerg Sonnenberger To: svn-src-all@freebsd.org Subject: Re: svn commit: r290499 - head/usr.bin/localedef Message-ID: <20151107162617.GA21271@britannica.bec.de> References: <201511071622.tA7GMTDN099727@repo.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <201511071622.tA7GMTDN099727@repo.freebsd.org> User-Agent: Mutt/1.5.24 (2015-08-30) X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Nov 2015 16:26:22 -0000 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