From: drh <drh@noemail.net>
Date: Wed, 7 Jul 2010 21:06:48 +0000 (+0000)
Subject: Make the initial salt values in the WAL header random values, not zero.
X-Git-Tag: version-3.7.2~161
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2327f5a454439779950e5311a4629a9663eacb09;p=thirdparty%2Fsqlite.git

Make the initial salt values in the WAL header random values, not zero.

FossilOrigin-Name: baa5eddd0539342945c14a2793c2579efb7e3b26
---

diff --git a/manifest b/manifest
index be2f04f262..4ef4234318 100644
--- a/manifest
+++ b/manifest
@@ -1,8 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-C Add\sthe\swrite-ahead\slog\sviewer/debugger\stool\sto\sthe\stools/\sfolder.
-D 2010-07-07T20:38:26
+C Make\sthe\sinitial\ssalt\svalues\sin\sthe\sWAL\sheader\srandom\svalues,\snot\szero.
+D 2010-07-07T21:06:49
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in c4270a1cd7cd70a263b7e96a258aa90e9c3618eb
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -229,7 +229,7 @@ F src/vdbeblob.c 258a6010ba7a82b72b327fb24c55790655689256
 F src/vdbemem.c 5e579abf6532001dfbee0e640dc34eae897a9807
 F src/vdbetrace.c 864cef96919323482ebd9986f2132435115e9cc2
 F src/vtab.c a0f8a40274e4261696ef57aa806de2776ab72cda
-F src/wal.c 7af0b976cff228186a0bbb2c51da6745d8cbf7c8
+F src/wal.c 5a58352aee4fb0546f4b94f8527a06300531bae9
 F src/wal.h 906c85760598b18584921fe08008435aa4eeeeb2
 F src/walker.c 3112bb3afe1d85dc52317cb1d752055e9a781f8f
 F src/where.c 926c83c6394e132a1c62b6b12ceeba7d55a34c19
@@ -835,14 +835,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
-P dd59cea6c860ad11f1794f3689a60ca6dbfffea5
-R 4559b02dd09dd3fa2dbefa99e196bc22
+P 0e4bd44682a252fb8af0df20f011b2b2364644b5
+R 3e8e721ad570d172d78ac52da59f315c
 U drh
-Z ad30a471cad3646f1676d8ebac7897b9
+Z bbea7d03fc96221a5e3f6f38a5beffde
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.6 (GNU/Linux)
 
-iD8DBQFMNOXFoxKgR168RlERAk58AJ4v8iaqhfRcTJaHxhSvg5qfcNNGQwCfcizQ
-q3LILSZEEzJjvAKNVDc/EEE=
-=ogId
+iD8DBQFMNOxsoxKgR168RlERApuBAJ40foMMW47Y5m6c1u/ufgGGmwSnsACdGxBb
+d9W5kuIuF/VxgdHdziuXS4M=
+=n1OA
 -----END PGP SIGNATURE-----
diff --git a/manifest.uuid b/manifest.uuid
index f743a28964..3cd72cf24c 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-0e4bd44682a252fb8af0df20f011b2b2364644b5
\ No newline at end of file
+baa5eddd0539342945c14a2793c2579efb7e3b26
\ No newline at end of file
diff --git a/src/wal.c b/src/wal.c
index f00da807af..89cc969807 100644
--- a/src/wal.c
+++ b/src/wal.c
@@ -1222,7 +1222,6 @@ int sqlite3WalOpen(
   pRet->pWalFd = (sqlite3_file *)&pRet[1];
   pRet->pDbFd = pDbFd;
   pRet->readLock = -1;
-  sqlite3_randomness(8, &pRet->hdr.aSalt);
   pRet->zWalName = zWalName;
   rc = sqlite3OsShmOpen(pDbFd);
 
@@ -2395,6 +2394,7 @@ int sqlite3WalFrames(
     sqlite3Put4byte(&aWalHdr[4], WAL_MAX_VERSION);
     sqlite3Put4byte(&aWalHdr[8], szPage);
     sqlite3Put4byte(&aWalHdr[12], pWal->nCkpt);
+    sqlite3_randomness(8, pWal->hdr.aSalt);
     memcpy(&aWalHdr[16], pWal->hdr.aSalt, 8);
     walChecksumBytes(1, aWalHdr, WAL_HDRSIZE-2*4, 0, aCksum);
     sqlite3Put4byte(&aWalHdr[24], aCksum[0]);