From owner-svn-src-all@freebsd.org Thu Jul 16 22:16:13 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 39A579A431C; Thu, 16 Jul 2015 22:16:13 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: from mail-wi0-x232.google.com (mail-wi0-x232.google.com [IPv6:2a00:1450:400c:c05::232]) (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 BD4CA1F2A; Thu, 16 Jul 2015 22:16:12 +0000 (UTC) (envelope-from baptiste.daroussin@gmail.com) Received: by wibud3 with SMTP id ud3so26093235wib.1; Thu, 16 Jul 2015 15:16:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to:user-agent; bh=aPSONctiyERezB5QawWR5VyEVCroH+dOI0468lXDEMU=; b=eIGfYOVel+JG6XYzSI9Rf+M5WPOkH/3EmC674k+X/jO8Kyqe4IUlsMzci6Gf5fqOFR FJwxOTmcZvxV2qTbDvrdUf/E7tcxbpW3rljNvYTYawHmkLOKvRG9ZYCTDVfKsiZ9VV/E ltKl1TAccqBaXTuiP2pSy/9sL9h9CS5bGW5zxAwDiPndb3OoBTo1VWUBhesadZ7k2c9p Y6tZ/A85ibmah3hSK8usOgrJ5cqku/CWUG/JTkJsKZ9LlIN49xceb0C6QhVMSqYyYXau 5HSIa7uTLGWlTy2fnsCnM3aFyVeq5Ty9YL5FAP/G8MB/xE/YTkwQhkA7vN5QW/ug730M jxpg== X-Received: by 10.180.182.40 with SMTP id eb8mr6141918wic.47.1437084970460; Thu, 16 Jul 2015 15:16:10 -0700 (PDT) Received: from ivaldir.etoilebsd.net ([2001:41d0:8:db4c::1]) by smtp.gmail.com with ESMTPSA id js3sm15249930wjc.5.2015.07.16.15.16.09 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 16 Jul 2015 15:16:09 -0700 (PDT) Sender: Baptiste Daroussin Date: Fri, 17 Jul 2015 00:16:07 +0200 From: Baptiste Daroussin To: "Pedro F. Giffuni" Cc: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r285644 - head/contrib/sqlite3 Message-ID: <20150716221607.GA82595@ivaldir.etoilebsd.net> References: <201507162207.t6GM7ECT009955@repo.freebsd.org> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="7AUc2qLy4jB3hD7Z" Content-Disposition: inline In-Reply-To: <201507162207.t6GM7ECT009955@repo.freebsd.org> User-Agent: Mutt/1.5.23 (2014-03-12) 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: Thu, 16 Jul 2015 22:16:13 -0000 --7AUc2qLy4jB3hD7Z Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jul 16, 2015 at 10:07:14PM +0000, Pedro F. Giffuni wrote: > Author: pfg > Date: Thu Jul 16 22:07:13 2015 > New Revision: 285644 > URL: https://svnweb.freebsd.org/changeset/base/285644 >=20 > Log: > sqlite: clean a couple of invocations of memcpy(3) > =20 > Found almost accidentally by our native gcc when enhanced with > FORTIFY_SOURCE. > =20 > Submitted by: Oliver Pinter > Sponosored by: Google Inc. GSoC 2015 >=20 > Modified: > head/contrib/sqlite3/sqlite3.c >=20 > Modified: head/contrib/sqlite3/sqlite3.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/contrib/sqlite3/sqlite3.c Thu Jul 16 19:40:18 2015 (r285643) > +++ head/contrib/sqlite3/sqlite3.c Thu Jul 16 22:07:13 2015 (r285644) > @@ -49487,9 +49487,9 @@ static void walIndexWriteHdr(Wal *pWal){ > pWal->hdr.isInit =3D 1; > pWal->hdr.iVersion =3D WALINDEX_MAX_VERSION; > walChecksumBytes(1, (u8*)&pWal->hdr, nCksum, 0, pWal->hdr.aCksum); > - memcpy((void *)&aHdr[1], (void *)&pWal->hdr, sizeof(WalIndexHdr)); > + memcpy((void *)&aHdr[1], (const void *)&pWal->hdr, sizeof(WalIndexHdr)= ); > walShmBarrier(pWal); > - memcpy((void *)&aHdr[0], (void *)&pWal->hdr, sizeof(WalIndexHdr)); > + memcpy((void *)&aHdr[0], (const void *)&pWal->hdr, sizeof(WalIndexHdr)= ); > } > =20 > /* >=20 Have you upstreamed that? because given how sqlite3.c file is done it will = be a pain on next update to not drop this change! Best regards, Bapt --7AUc2qLy4jB3hD7Z Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEARECAAYFAlWoLScACgkQ8kTtMUmk6ExQ1gCfd03OVZVWN1rFOODjA45YvJjJ 9ngAoJWIsXSJp135eZ7p+hwE2v1Fy0qG =mXQH -----END PGP SIGNATURE----- --7AUc2qLy4jB3hD7Z--