database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-12 13:01:09 +03:00
Code Activity

Fix an off-by-one error while constructing the name of the mmap file for

Browse Source 
the wal-index under os_unix.c.

FossilOrigin-Name: 6e3735f72cb7d2f4d16c8f9bc59ff159c75243e5
This commit is contained in:
drh
2010-05-10 19:51:32 +00:00
parent 7ddccd2aad
commit 09b1330026
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Merge\s[96d6eaf4d2]\sand\s[40b0a6357b]. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-05-10T18:10:18 Hash: SHA1
C Fix\san\soff-by-one\serror\swhile\sconstructing\sthe\sname\sof\sthe\smmap\sfile\sfor\nthe\swal-index\sunder\sos_unix.c.
D 2010-05-10T19:51:33
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3 F Makefile.in a5cad1f8f3e021356bfcc6c77dc16f6f1952bbc3
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -152,7 +155,7 @@ F src/os.c aec6922553585a25d5655666defc125a7e217674
F src/os.h b389844e5469a2918e8a45fe6ae52b4c28dfb2b2 F src/os.h b389844e5469a2918e8a45fe6ae52b4c28dfb2b2
F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d F src/os_common.h 0d6ee583b6ee3185eb9d951f890c6dd03021a08d
F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0 F src/os_os2.c 8ad77a418630d7dee91d1bb04f79c2096301d3a0
F src/os_unix.c f3a7ea94e5b59b602d6a6981489554dabcd9c88b F src/os_unix.c 34fe71c67fce72360411d60fe069c7f0dc612dd0
F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1 F src/os_win.c a8fc01d8483be472e495793c01064fd87e56a5c1
F src/pager.c a47af9c2c9ca425bd68642d61764266331a3323f F src/pager.c a47af9c2c9ca425bd68642d61764266331a3323f
F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c F src/pager.h 934b598583a9d936bb13c37d62a2fe68ac48781c
@@ -813,7 +816,14 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P 40b0a6357b160e04326ab176955a68a1cf3f8b7c 96d6eaf4d2be453191b36875811d9556ad0763ed P c67756c404669141fa06a1ce3f1efadefa277bc6
R 37996b296fbd165c26242b3ad78ab5eb R a32c835dc9b43b32dcafe3e3af944d60
U dan U drh
Z 33e8496ccc7b964e8849eef5eb4645d8 Z 3ba54b43517c1555d6a58b385aeeda6a
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL6GPIoxKgR168RlERAvgHAJ4mrKDkzo8GJO2fKoAPudvDpTqQZgCfeiBD
rtdc++T8qeWjlXhi4ufBbL8=
=5REM
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
c67756c404669141fa06a1ce3f1efadefa277bc6 6e3735f72cb7d2f4d16c8f9bc59ff159c75243e5

2
src/os_unix.c
View File

@@ -4974,7 +4974,7 @@ static int unixShmOpen(
} }
memset(pNew, 0, sizeof(*pNew)); memset(pNew, 0, sizeof(*pNew));
pNew->zFilename = (char*)&pNew[1]; pNew->zFilename = (char*)&pNew[1];
sqlite3_snprintf(nName+10, pNew->zFilename, "%s-wal-index", zName); sqlite3_snprintf(nName+11, pNew->zFilename, "%s-wal-index", zName);
/* Look to see if there is an existing unixShmFile that can be used. /* Look to see if there is an existing unixShmFile that can be used.
** If no matching unixShmFile currently exists, create a new one. ** If no matching unixShmFile currently exists, create a new one.