Make sure temporary file names in windows have a full 15 characters of

random text at the end. (CVS 1059)

FossilOrigin-Name: 6ccb92b14f2e6e01bb60dac10331fa7be0b4525e

diff --git a/manifest b/manifest
index 650b73ef71db3891d940da5c290b5af9f521a3b2..50ec63417a41e3593acb47b7cd52a4657afc1c64 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sthe\sLIMIT\sclause\sso\sthat\sit\sapplies\sto\sthe\sentire\squery\sin\sa\scompound\nquery.\s\sPrior\sto\sthis\schange\sLIMITs\son\scompound\squeries\sdid\snot\swork\sat\nall.\s\sTicket\s#393.\s(CVS\s1058)
-D 2003-07-20T01:16:47
+C Make\ssure\stemporary\sfile\snames\sin\swindows\shave\sa\sfull\s15\scharacters\sof\nrandom\stext\sat\sthe\send.\s(CVS\s1059)
+D 2003-07-22T00:39:14
 F Makefile.in 9ad23ed4ca97f9670c4496432e3fbd4b3760ebde
 F Makefile.linux-gcc b86a99c493a5bfb402d1d9178dcdc4bd4b32f906
 F README f1de682fbbd94899d50aca13d387d1b3fd3be2dd
@@ -35,7 +35,7 @@ F src/hash.h cd0433998bc1a3759d244e1637fe5a3c13b53bf8
 F src/insert.c fc4c26a0bb505fb802babfb9a7b7a1d4be2e3061
 F src/main.c 8053b3a76e4e77c769b324a2f1cc99a0265d0ec4
 F src/md5.c fe4f9c9c6f71dfc26af8da63e4d04489b1430565
-F src/os.c 0d5252d60c1b0f21a343b18248d3dfcafb94e621
+F src/os.c 2f24ede4d3464ac38d24d113e0d44d3c7d460be4
 F src/os.h 9e5bbddff123187295e3d00d49af06192cd1cd49
 F src/pager.c 9512e789dbd5acaf91e74c4665e03c2734d3da25
 F src/pager.h 5da62c83443f26b1792cfd72c96c422f91aadd31
@@ -168,7 +168,7 @@ F www/speed.tcl 2f6b1155b99d39adb185f900456d1d592c4832b3
 F www/sqlite.tcl 3c83b08cf9f18aa2d69453ff441a36c40e431604
 F www/tclsqlite.tcl 1db15abeb446aad0caf0b95b8b9579720e4ea331
 F www/vdbe.tcl 9b9095d4495f37697fd1935d10e14c6015e80aa1
-P c35e50717678703763c696e3e9b265add2ca6454
-R b4eed2ab716bec174fb746f718cb9bae
+P 543479e3aed77976a0c689cf40811bf88353f706
+R 4b5c7a99f11b5b97ce8b005695a09544
 U drh
-Z 22959393424831715116c486cae1faab
+Z 3eaafec342ab59e94ea1fdb3d5b75ad3

diff --git a/manifest.uuid b/manifest.uuid
index a4cf6a29609ced533e72b77daa554ffbf3fbf92d..5ddf319a38f7f1b5ee47e796633600a67daca029 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-543479e3aed77976a0c689cf40811bf88353f706
\ No newline at end of file
+6ccb92b14f2e6e01bb60dac10331fa7be0b4525e
\ No newline at end of file

diff --git a/src/os.c b/src/os.c
index 0b962f0ad1129b70718dd9ffb0f05da87baf0d0c..cca4ac48dcf915903eabae37bfcca0c5c08db7ce 100644 (file)
--- a/src/os.c
+++ b/src/os.c
@@ -647,7 +647,7 @@ int sqliteOsTempFileName(char *zBuf){
     sprintf(zBuf, "%s\\"TEMP_FILE_PREFIX, zTempPath);
     j = strlen(zBuf);
     for(i=0; i<15; i++){
-      int n = sqliteRandomByte() % sizeof(zChars);
+      int n = sqliteRandomByte() % (sizeof(zChars) - 1);
       zBuf[j++] = zChars[n];
     }
     zBuf[j] = 0;