mirrors/sqlite
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memory allocation in proxy locking so that it works with SQLITE_MEMDEBUG.

Browse Source 
FossilOrigin-Name: f854cbe06355dd3455b8af4ad6366949c412434e
This commit is contained in:
drh 2010-08-11 06:14:15 +00:00
parent 216eaab282
commit d56b121d10
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@ -1,5 +1,5 @@
C Merge\sexperimental\schanges\sinto\strunk.
D 2010-08-11T06:04:19
C Fix\smemory\sallocation\sin\sproxy\slocking\sso\sthat\sit\sworks\swith\sSQLITE_MEMDEBUG.
D 2010-08-11T06:14:16
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in ec08dc838fd8110fe24c92e5130bcd91cbb1ff2e
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -154,7 +154,7 @@ F src/os.c 60178f518c4d6c0dcb59f7292232281d7bea2dcf
F src/os.h 9dbed8c2b9c1f2f2ebabc09e49829d4777c26bf9
F src/os_common.h a8f95b81eca8a1ab8593d23e94f8a35f35d4078f
F src/os_os2.c 72d0b2e562952a2464308c4ce5f7913ac10bef3e
F src/os_unix.c ae5ca8a6031380708f3fec7be325233d49944914
F src/os_unix.c 11194cbcf6a57456e58022dc537ab8c3497d9bb9
F src/os_win.c 51cb62f76262d961ea4249489383d714501315a7
F src/pager.c b3db762350ee71f5f8bde04f21ca2ffcccded483
F src/pager.h 80726162dc3942f59ab27b738fb667b9ba0a89d5
@ -843,7 +843,7 @@ F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
P e82e32bd431ccacd276df8241592eb5519d87122 42ba43ac690dc800fb8b969ae257a79942918342
R 905d488f0b9b28e6cb7ddb8f6f378b5f
U dan
Z cd4d4135a3c0d3f56327a6ac460d7792
P aa092ac928dc19bd356d25a1dfd3f432dc145ce6
R 0eec45cd382afd1ba34bd6e2246aabd9
U drh
Z c435d17ee732eeb430792e4998e9f07c

2
manifest.uuid
View File

@ -1 +1 @@
aa092ac928dc19bd356d25a1dfd3f432dc145ce6
f854cbe06355dd3455b8af4ad6366949c412434e

6
src/os_unix.c
View File

@ -5979,7 +5979,7 @@ static int proxyTransformUnixFile(unixFile *pFile, const char *path) {
pCtx->conchFile->pMethod->xClose((sqlite3_file *)pCtx->conchFile);
sqlite3_free(pCtx->conchFile);
}
sqlite3_free(pCtx->lockProxyPath);
sqlite3DbFree(0, pCtx->lockProxyPath);
sqlite3_free(pCtx->conchFilePath);
sqlite3_free(pCtx);
}
@ -6170,9 +6170,9 @@ static int proxyClose(sqlite3_file *id) {
if( rc ) return rc;
sqlite3_free(conchFile);
}
sqlite3_free(pCtx->lockProxyPath);
sqlite3DbFree(0, pCtx->lockProxyPath);
sqlite3_free(pCtx->conchFilePath);
sqlite3_free(pCtx->dbPath);
sqlite3DbFree(0, pCtx->dbPath);
/* restore the original locking context and pMethod then close it */
pFile->lockingContext = pCtx->oldLockingContext;
pFile->pMethod = pCtx->pOldMethod;