svn commit: r285644 - head/contrib/sqlite3

[Baptiste Daroussin]

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!

Best regards,
Bapt
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 181 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20150717/53d41abf/attachment.bin>