From owner-svn-src-all@freebsd.org Sat Nov 7 16:31:01 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 B3A47A286BB for ; Sat, 7 Nov 2015 16:31:01 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-wm0-x229.google.com (mail-wm0-x229.google.com [IPv6:2a00:1450:400c:c09::229]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4C2081EB2 for ; Sat, 7 Nov 2015 16:31:01 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: by wmww144 with SMTP id w144so49062140wmw.1 for ; Sat, 07 Nov 2015 08:30:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=L2c638ansAB+ekfoFQSF+9DvQxsZXpaTOPD9jXcqeec=; b=XYg0QMXj6ALuPvKAudjZmSDYQVpB8Xk84B6WNEOtiE3bvOelklZUiPKLBzyU4mNS0S nu6mB/VFGkHrs5VlN9z7cGjf44+IQbrS5fA2ntootLHygngwaGMbBM0r6bknOyujil5G IMlB8Pi24llyWUKTpa7eYle+yHPNB/KdpBKDgJGZx7pkgNSXDlMeNCs7I/B9yYM6Z7B5 5LJJ72QMxaydnUVMtKjuWtBN51h5gqjHg8zBh/Ostiz51RB/GWozd/xTOAdQyob/tj19 BD2ohl6kYr9Xto8LYCfxtvDGAwwi4hqX8AO6dsACycqZ8NGh/B3dYBKcdq+ntGDk5mR1 tYew== MIME-Version: 1.0 X-Received: by 10.28.218.72 with SMTP id r69mr17089684wmg.98.1446913859872; Sat, 07 Nov 2015 08:30:59 -0800 (PST) Received: by 10.27.12.197 with HTTP; Sat, 7 Nov 2015 08:30:59 -0800 (PST) Received: by 10.27.12.197 with HTTP; Sat, 7 Nov 2015 08:30:59 -0800 (PST) In-Reply-To: <20151107162617.GA21271@britannica.bec.de> References: <201511071622.tA7GMTDN099727@repo.freebsd.org> <20151107162617.GA21271@britannica.bec.de> Date: Sat, 7 Nov 2015 19:30:59 +0300 Message-ID: Subject: Re: svn commit: r290499 - head/usr.bin/localedef From: Sergey Kandaurov To: Joerg Sonnenberger Cc: svn-src-all@freebsd.org Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-Content-Filtered-By: Mailman/MimeDel 2.1.20 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:31:01 -0000 7 =D0=BD=D0=BE=D1=8F=D0=B1. 2015 =D0=B3. 7:26 PM =D0=BF=D0=BE=D0=BB=D1=8C= =D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D1=8C "Joerg Sonnenberger" < joerg@britannica.bec.de> =D0=BD=D0=B0=D0=BF=D0=B8=D1=81=D0=B0=D0=BB: > > 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 > > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D > > --- 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 =3D calloc(sizeof (collate_large_t) * n, 1); > > + large =3D malloc(sizeof (collate_large_t) * n); > > + memset(large, 0, sizeof (collate_large_t) * n); > > if (large =3D=3D NULL) { > > fprintf(stderr, "out of memory"); > > return; > > Why was this not calloc(sizeof(), n) in first place?! > And memset should probably be moved after the check against null.