Fix alignment issue in instrumentation code. (CVS 5005)

FossilOrigin-Name: c9e0d625bcf3ff24229d7f011b4cfbd8d8140d16
This commit is contained in:
danielk1977 2008-04-14 17:42:41 +00:00
parent a3e5218c6e
commit 30f72bf2c5
3 changed files with 10 additions and 11 deletions

View File

@ -1,5 +1,5 @@
C Do\snot\sset\sthe\spager\sto\spersistent\serror\sstate\sif\sa\scall\sto\sOsAccess()\sfails.\s(CVS\s5004)
D 2008-04-14T16:37:10
C Fix\salignment\sissue\sin\sinstrumentation\scode.\s(CVS\s5005)
D 2008-04-14T17:42:42
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@ -164,7 +164,7 @@ F src/test_loadext.c 22065d601a18878e5542191001f0eaa5d77c0ed8
F src/test_malloc.c c92a65e8f9b31bb2b332448d92d2016c000a963d
F src/test_md5.c bca40b727c57462ddb415e57c5323445a1bb1a40
F src/test_onefile.c 2fea6d22f13f5f286356c80c77ffd41f995f2b7a
F src/test_osinst.c caaf21cad43c2e642011b71fcddf16838b35fe00
F src/test_osinst.c 7129ca5f91e655020539b4e628cb578dd30ac5c7
F src/test_schema.c 12c9de7661d6294eec2d57afbb52e2af1128084f
F src/test_server.c a6ece6c835e7eae835054124e09e947e422b1ac5
F src/test_tclvar.c b2d1115e4d489179d3f029e765211b2ad527ba59
@ -628,7 +628,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 36b6610b25997074f398a2f2ddcdd6ace8c83fba
R 43bb36d879d26b952cfe1e8f8637ed28
P aa16eb572915632bfff88d544f9c428ca723346e
R 6328e3f1bdbc17ecc3f68bba8e7f06fb
U danielk1977
Z b02efe45adf04a6ce186ead764888427
Z 2265f9810d7446c460ed57d3921ef016

View File

@ -1 +1 @@
aa16eb572915632bfff88d544f9c428ca723346e
c9e0d625bcf3ff24229d7f011b4cfbd8d8140d16

View File

@ -641,6 +641,7 @@ static void binarylog_xdel(void *p){
pFile->pMethods->xWrite(pFile, pLog->zBuf, pLog->nBuf, pLog->iOffset);
}
pFile->pMethods->xClose(pFile);
sqlite3_free(pLog->pOut);
sqlite3_free(pLog->zBuf);
sqlite3_free(pLog);
}
@ -662,15 +663,13 @@ sqlite3_vfs *sqlite3_instvfs_binarylog(
return 0;
}
nByte = sizeof(InstVfsBinaryLog) + pParent->szOsFile + pParent->mxPathname+1;
nByte = sizeof(InstVfsBinaryLog) + pParent->mxPathname+1;
p = (InstVfsBinaryLog *)sqlite3_malloc(nByte);
memset(p, 0, nByte);
p->zBuf = sqlite3_malloc(BINARYLOG_BUFFERSIZE);
p->zOut = (char *)&p[1];
p->pOut = (sqlite3_file *)&p->zOut[pParent->mxPathname+1];
p->pOut = (sqlite3_file *)sqlite3_malloc(pParent->szOsFile);
pParent->xFullPathname(pParent, zLog, pParent->mxPathname, p->zOut);
flags = SQLITE_OPEN_READWRITE|SQLITE_OPEN_CREATE|SQLITE_OPEN_MASTER_JOURNAL;
pParent->xDelete(pParent, p->zOut, 0);
rc = pParent->xOpen(pParent, p->zOut, p->pOut, flags, &flags);