From: drh <drh@noemail.net>
Date: Sat, 15 Sep 2012 13:39:24 +0000 (+0000)
Subject: Make sure the name of rollback journal files are double-zero terminated
X-Git-Tag: version-3.7.15~135
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55b4c226d1e505e8c4a8d67458dec9765ced22da;p=thirdparty%2Fsqlite.git

Make sure the name of rollback journal files are double-zero terminated
when they are passed into the VFS.

FossilOrigin-Name: 8711a8447d28275602287faf533de3d6e50d535d
---

diff --git a/manifest b/manifest
index 1f583a1c34..816c07ad80 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Factor\sout\sthe\scode\sthat\sgenerates\sa\sco-routine\sfor\sevaluating\sthe\sSELECT\non\sthe\sRHS\sof\san\sINSERT\sstatement\sso\sthat\sthe\ssame\scode\scan\spotentially\nbe\sreused\sin\sother\splaces.
-D 2012-09-15T13:29:23.328
+C Make\ssure\sthe\sname\sof\srollback\sjournal\sfiles\sare\sdouble-zero\sterminated\nwhen\sthey\sare\spassed\sinto\sthe\sVFS.
+D 2012-09-15T13:39:24.735
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 5f4f26109f9d80829122e0e09f9cda008fa065fb
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -162,7 +162,7 @@ F src/os.h 027491c77d2404c0a678bb3fb06286f331eb9b57
 F src/os_common.h 92815ed65f805560b66166e3583470ff94478f04
 F src/os_unix.c 69b2fe66316524eebf5f1ce85c1fdfe2952307e9
 F src/os_win.c 90c7a1fe2698867555ba4266f5bd436c85d0d1dc
-F src/pager.c 5665fa9ecec51f11dabdfd8eefefa89391856007
+F src/pager.c 9c59818c480261c1c5a4772532e0df92a27745a1
 F src/pager.h 8b8c9bc065a3c66769df8724dfdf492ee1aab3c5
 F src/parse.y f29df90bd3adc64b33114ab1de9fb7768fcf2099
 F src/pcache.c f8043b433a57aba85384a531e3937a804432a346
@@ -1013,7 +1013,7 @@ F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 67d8a99aceb56384a81b3f30d6c71743146d2cc9
-P 6b252a0d1a78db7bf2d650bafc214ea4064eef9e
-R df7cddb2132aa1a021f32020fc480477
+P a93ee09cdc15987848bf9023e69892ce9a5f989e
+R ecaebb814f51bb6e38f5c9d70e5c1467
 U drh
-Z c609d2d14d939fff56bf9fbc82b9e705
+Z a699a11a3dac3cfd2b9a3a76bfd53ddc
diff --git a/manifest.uuid b/manifest.uuid
index 904fea2c79..e60e09e0ac 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-a93ee09cdc15987848bf9023e69892ce9a5f989e
\ No newline at end of file
+8711a8447d28275602287faf533de3d6e50d535d
\ No newline at end of file
diff --git a/src/pager.c b/src/pager.c
index 09c2a5f90d..a094e0da20 100644
--- a/src/pager.c
+++ b/src/pager.c
@@ -4448,7 +4448,7 @@ int sqlite3PagerOpen(
     memcpy(pPager->zFilename, zPathname, nPathname);
     if( nUri ) memcpy(&pPager->zFilename[nPathname+1], zUri, nUri);
     memcpy(pPager->zJournal, zPathname, nPathname);
-    memcpy(&pPager->zJournal[nPathname], "-journal\000", 8+1);
+    memcpy(&pPager->zJournal[nPathname], "-journal\000", 8+2);
     sqlite3FileSuffix3(pPager->zFilename, pPager->zJournal);
 #ifndef SQLITE_OMIT_WAL
     pPager->zWal = &pPager->zJournal[nPathname+8+1];