Fix a sprintf() problem introduced by (3916). (CVS 3927)

FossilOrigin-Name: 54a1d275aa0154a88d433a3c4df538d52c2c3ecb
This commit is contained in:
drh 2007-05-05 12:06:24 +00:00
parent c4c6b2a23d
commit 59df4cda00
3 changed files with 9 additions and 8 deletions

View File

@ -1,5 +1,5 @@
C Refactoring.\s\sSplit\sbtreeInt.h\soff\sfrom\sbtree.c.\s\sSplit\smalloc.c\soff\sfrom\nutil.c.\s\sExpect\smuch\smore\sto\sfollow.\s(CVS\s3926) C Fix\sa\ssprintf()\sproblem\sintroduced\sby\s(3916).\s(CVS\s3927)
D 2007-05-05T11:48:53 D 2007-05-05T12:06:24
F Makefile.in 80d63bf2c61619ae0e29795948ec19e79f91acc3 F Makefile.in 80d63bf2c61619ae0e29795948ec19e79f91acc3
F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935 F Makefile.linux-gcc 2d8574d1ba75f129aba2019f0b959db380a90935
F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028 F README 9c4e2d6706bdcc3efdd773ce752a8cdab4f90028
@ -87,7 +87,7 @@ F src/os_test.c 49833426101f99aee4bb5f6a44b7c4b2029fda1c
F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3 F src/os_test.h 903c93554c23d88f34f667f1979e4a1cee792af3
F src/os_unix.c cb1fb044b84870c7b1b8b2902e9d7be779f8b7ce F src/os_unix.c cb1fb044b84870c7b1b8b2902e9d7be779f8b7ce
F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e F src/os_unix.h 5768d56d28240d3fe4537fac08cc85e4fb52279e
F src/os_win.c 5e9e3d2aeed4d6f1b6ae81e866919f4f43b4a23d F src/os_win.c 3b6169038101d06c54b4f04662bfd44b6cf2f289
F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b F src/os_win.h 41a946bea10f61c158ce8645e7646b29d44f122b
F src/pager.c 9c9a9df78636f4b9c8e18f90e93337a1231aaef7 F src/pager.c 9c9a9df78636f4b9c8e18f90e93337a1231aaef7
F src/pager.h d652ddf092d2318d00e41f8539760fe8e57c157c F src/pager.h d652ddf092d2318d00e41f8539760fe8e57c157c
@ -477,7 +477,7 @@ F www/tclsqlite.tcl bb0d1357328a42b1993d78573e587c6dcbc964b9
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 16041116aaaa2d52a289aa02a24bef579ba60896 P ad549a40ed3500fb3d552ed19ff791d1280e0b62
R f966d62a9229ee8e5f7295776797e7fa R 8e70c7a5e1bfad9e41e67f958c0c12ec
U drh U drh
Z 72b63b85651355f7325768fd841ffcca Z 58284854439e023cfa44a554bd182ac1

View File

@ -1 +1 @@
ad549a40ed3500fb3d552ed19ff791d1280e0b62 54a1d275aa0154a88d433a3c4df538d52c2c3ecb

View File

@ -946,7 +946,8 @@ int sqlite3WinTempFileName(char *zBuf){
for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){} for(i=strlen(zTempPath); i>0 && zTempPath[i-1]=='\\'; i--){}
zTempPath[i] = 0; zTempPath[i] = 0;
for(;;){ for(;;){
sqlite3_snprintf(sizeof(zBuf), zBuf, "%s\\"TEMP_FILE_PREFIX, zTempPath); sqlite3_snprintf(SQLITE_TEMPNAME_SIZE, zBuf,
"%s\\"TEMP_FILE_PREFIX, zTempPath);
j = strlen(zBuf); j = strlen(zBuf);
sqlite3Randomness(15, &zBuf[j]); sqlite3Randomness(15, &zBuf[j]);
for(i=0; i<15; i++, j++){ for(i=0; i<15; i++, j++){