svn commit: r285644 - head/contrib/sqlite3

Pedro F. Giffuni pfg at FreeBSD.org
Thu Jul 16 22:07:15 UTC 2015


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));
 }
 
 /*


More information about the svn-src-all mailing list