Date: Sat, 7 Nov 2015 19:30:59 +0300 From: Sergey Kandaurov <pluknet@gmail.com> To: Joerg Sonnenberger <joerg@britannica.bec.de> Cc: svn-src-all@freebsd.org Subject: Re: svn commit: r290499 - head/usr.bin/localedef Message-ID: <CAE-mSOKF_nUMTEdM-W7GvKUQcTCCuvVBzSEKAgWbx6_pLkc%2BBw@mail.gmail.com> In-Reply-To: <20151107162617.GA21271@britannica.bec.de> References: <201511071622.tA7GMTDN099727@repo.freebsd.org> <20151107162617.GA21271@britannica.bec.de>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAE-mSOKF_nUMTEdM-W7GvKUQcTCCuvVBzSEKAgWbx6_pLkc%2BBw>