From owner-svn-src-all@freebsd.org Thu Jul 16 22:26:06 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 1ECD79A4456 for ; Thu, 16 Jul 2015 22:26:06 +0000 (UTC) (envelope-from pfg@FreeBSD.org) Received: from nm48.bullet.mail.bf1.yahoo.com (nm48.bullet.mail.bf1.yahoo.com [216.109.114.64]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C559D15F3 for ; Thu, 16 Jul 2015 22:26:05 +0000 (UTC) (envelope-from pfg@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.com; s=s2048; t=1437085198; bh=mpDSHk+txJYESxU1JBeVsz5comu+XZ6Tb80/pTjYpFs=; h=Date:From:To:CC:Subject:References:In-Reply-To:From:Subject; b=HW/S3ud75uZVwg4ux5WodOCDTCiXZLbXR1Hq//CS+lCMKuK0YIarYesLIohHSDZOOof8gT3MQxlP5FBEDaLajfE9QNEvoZCVtcBe3hzhUcRORNQNSSp8fTFUZAw9yKBWI+W02cp4ZB82AzoZLDkTo6sYQERpn7+wRka03dzotqRtkTixTuU6VLJM7v3UF0DFY6ZXAXfyjA1BrTPSxQQ89ueu/tP6CQrKooZ2btcnNQgmKmojR1iuPoHqbVFJ8zL4/oQd2hAJArk/shnKef3objGXSed8QZx9eUoxO7354pG8UMOoS9IwG11p7jTjzhgickuuloiEN5MVA6/Q2b2czw== Received: from [66.196.81.174] by nm48.bullet.mail.bf1.yahoo.com with NNFMP; 16 Jul 2015 22:19:58 -0000 Received: from [98.139.211.163] by tm20.bullet.mail.bf1.yahoo.com with NNFMP; 16 Jul 2015 22:19:58 -0000 Received: from [127.0.0.1] by smtp220.mail.bf1.yahoo.com with NNFMP; 16 Jul 2015 22:19:58 -0000 X-Yahoo-Newman-Id: 285881.7599.bm@smtp220.mail.bf1.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: _bJ2v_sVM1nmgVbHuH0MVlnd66LN9jBO981aiMqjmydVNwe cPZjSs3Tywwh5FIC6RB3AOZSkQnO_Loi98GNtWLon2SGNkKxIRIqZvTC4zM. vmECH4xOrxDf124ZHzdnwqwUh1ZDeXWabkyKUgEunQYjXiouhSRpmKq7BTqc 93Hz7l5farcgUC1X_06OTWB7CCnlPtWk_E2nCe25XlXoWy3KGjz5JMHiZBs3 m4CBge44FS_kDPebHaw5hoMkvN1CUkNjxLosZTzB6xBe_daQyAWclv6mqAUh a.1j5OK3YuPv9sT85vuUSDT6wn73wFJbz91yLhDixTNR5xyLA_XEzgoy0F_h qxoQUmXsau64DeKzWFM8OIiAyZK0jsj8PzP8da1PKzhgFXO5Tt_H9CIjW00K pjKm7HvV.e8SZ9HavQOCwl6_VTX82uo5ZVMaUX4a_8VbTVo.crYzt.Sz23rc 4WCHtZzV1.o8JWtZK8wL_bajoPp5zLIk2jYvePkQarbnlMMmb6_XEtRvMMpg J8vvlTRNMY.UVuXljsFp.2jDOM2_akaWj X-Yahoo-SMTP: xcjD0guswBAZaPPIbxpWwLcp9Unf Message-ID: <55A82ECE.1040406@FreeBSD.org> Date: Thu, 16 Jul 2015 17:23:10 -0500 From: Pedro Giffuni User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:31.0) Gecko/20100101 Thunderbird/31.7.0 MIME-Version: 1.0 To: Baptiste Daroussin CC: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: Re: svn commit: r285644 - head/contrib/sqlite3 References: <201507162207.t6GM7ECT009955@repo.freebsd.org> <20150716221607.GA82595@ivaldir.etoilebsd.net> In-Reply-To: <20150716221607.GA82595@ivaldir.etoilebsd.net> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit 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:26:06 -0000 On 07/16/15 17:16, Baptiste Daroussin wrote: > 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 >> >> Log: >> sqlite: clean a couple of invocations of memcpy(3) >> >> Found almost accidentally by our native gcc when enhanced with >> FORTIFY_SOURCE. >> >> Submitted by: Oliver Pinter >> Sponosored by: Google Inc. GSoC 2015 >> >> Modified: >> head/contrib/sqlite3/sqlite3.c >> >> Modified: head/contrib/sqlite3/sqlite3.c >> ============================================================================== >> --- 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 = 1; >> pWal->hdr.iVersion = 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)); >> } >> >> /* >> > 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! I asked Oliver to do it, but I will crosscheck. Pedro.