Skip site navigation (1)Skip section navigation (2) 
Date:      Tue, 20 Jun 2006 21:04:00 -0400
From:      Alexander Kabaev <kabaev@gmail.com>
To:        current@FreeBSD.org, obrien@FreeBSD.ORG
Subject:   libmagic build failures (tmp patch)
Message-ID:  <20060620210400.57956fbd@kan.dnsalias.net>
next in thread | raw e-mail | index | archive | help 
--Sig_CI19v6.fZ/BfVg+tI5VEHh8
Content-Type: multipart/mixed; boundary="MP__YPq7PBzhhk_H5kQidj8f/S"

--MP__YPq7PBzhhk_H5kQidj8f/S
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline

I tried to build a fresh world today and was bitten by build failures
in libmagic. Apparently last vendor import has included a bug in vendor
code. Attached patch lets the buildworld complete.

--=20
Alexander Kabaev

--MP__YPq7PBzhhk_H5kQidj8f/S
Content-Type: text/x-patch; name=apprentice.c.diff
Content-Transfer-Encoding: quoted-printable
Content-Disposition: attachment; filename=apprentice.c.diff

Index: apprentice.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
RCS file: /home/ncvs/src/contrib/file/apprentice.c,v
retrieving revision 1.1.1.10
diff -u -r1.1.1.10 apprentice.c
--- apprentice.c	19 Jun 2006 07:52:12 -0000	1.1.1.10
+++ apprentice.c	21 Jun 2006 00:43:37 -0000
@@ -381,7 +381,7 @@
 	}
=20
         maxmagic =3D MAXMAGIS;
-	if ((marray =3D malloc(maxmagic * sizeof(*marray))) =3D=3D NULL) {
+	if ((marray =3D calloc(maxmagic, sizeof(*marray))) =3D=3D NULL) {
 		(void)fclose(f);
 		file_oomem(ms);
 		return -1;

--MP__YPq7PBzhhk_H5kQidj8f/S--

--Sig_CI19v6.fZ/BfVg+tI5VEHh8
Content-Type: application/pgp-signature; name=signature.asc
Content-Disposition: attachment; filename=signature.asc

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (FreeBSD)

iD8DBQFEmJsHQ6z1jMm+XZYRAm/8AKCVRbEWUqyU+VUhv7Hq4lwIkESpPwCgi48l
R70QD6Ns40cM7RGNNX6Lb4U=
=bGxB
-----END PGP SIGNATURE-----

--Sig_CI19v6.fZ/BfVg+tI5VEHh8--

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060620210400.57956fbd>