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

Fix a couple of incorrect evidence marks on malloc().

Browse Source 
FossilOrigin-Name: f9b5c5cb135f3d0bb2b64b4d3f8d77bbd8d2ae98
This commit is contained in:
drh 2010-09-11 16:25:42 +00:00
parent 71a1a0f485
commit 39f67bebdd
3 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
manifest
View File

@ -1,5 +1,8 @@
C Additional\sevidence\smarks\son\sthe\smalloc()\simplementation.\s\sUpdate\sthe\s\ndocumentation\sto\sexplain\sthat\smallocs\sare\snot\snecessarily\s8-byte\saligned\nif\sthe\sSQLITE_4_BYTE_ALIGNED_MALLOC\scompile-time\soption\sis\sused. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-09-11T16:15:56 Hash: SHA1
C Fix\sa\scouple\sof\sincorrect\sevidence\smarks\son\smalloc().
D 2010-09-11T16:25:43
F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee F Makefile.in c599a15d268b1db2aeadea19df2adc3bf2eb6bee
F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@ -140,7 +143,7 @@ F src/legacy.c a199d7683d60cef73089e892409113e69c23a99f
F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e F src/lempar.c 7f026423f4d71d989e719a743f98a1cbd4e6d99e
F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8 F src/loadext.c 6d422ea91cf3d2d00408c5a8f2391cd458da85f8
F src/main.c da74b2269470d97a702d2956eeeb691a5e3a68c3 F src/main.c da74b2269470d97a702d2956eeeb691a5e3a68c3
F src/malloc.c 44a50eb10bb755a7b27799b41b874e53bd6e24e3 F src/malloc.c 579a6eee344a63c607c4b2933e9258708d0f6cc7
F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206 F src/mem1.c 00bd8265c81abb665c48fea1e0c234eb3b922206
F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf F src/mem2.c e307323e86b5da1853d7111b68fd6b84ad6f09cf
@ -857,7 +860,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 305cc4e6c1164b1ede0c3177e3c0f9b8644df0f6 P 42b4bf9e72501cf228b4086437c7660443933f74
R d4739e5fcf915e019da850204032c340 R 02842908c71434dfd48b3d12f71c7ce4
U drh U drh
Z 342cca73834b234d21ed5424a5f029e5 Z 89e17357ae4594472aa1432bdf4145bd
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (Darwin)
iEYEARECAAYFAkyLrYcACgkQoxKgR168RlGFEgCghibqg9PjE+oX345EOAHijLn6
iVEAnA4DX4kEG/ViEAgOvP/d6Ckpzf6B
=HUXW
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@ -1 +1 @@
42b4bf9e72501cf228b4086437c7660443933f74 f9b5c5cb135f3d0bb2b64b4d3f8d77bbd8d2ae98

4
src/malloc.c
View File

@ -309,7 +309,7 @@ void *sqlite3Malloc(int n){
}else{ }else{
p = sqlite3GlobalConfig.m.xMalloc(n); p = sqlite3GlobalConfig.m.xMalloc(n);
} }
assert( EIGHT_BYTE_ALIGNMENT(p) ); /* IMP: R-36023-12588 */ assert( EIGHT_BYTE_ALIGNMENT(p) ); /* IMP: R-04675-44850 */
return p; return p;
} }
@ -547,7 +547,7 @@ void *sqlite3Realloc(void *pOld, int nBytes){
}else{ }else{
pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew); pNew = sqlite3GlobalConfig.m.xRealloc(pOld, nNew);
} }
assert( EIGHT_BYTE_ALIGNMENT(pNew) ); /* IMP: R-36023-12588 */ assert( EIGHT_BYTE_ALIGNMENT(pNew) ); /* IMP: R-04675-44850 */
return pNew; return pNew;
} }