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

Fix the sqlite3_mutex_alloc() interface to return NULL (not segfault) when

Browse Source 
operating in threadsafe mode.  (This is a general-purpose bug fix which
really ought to be ported to trunk.)

FossilOrigin-Name: 64840a3caf569959c9d5e63bdbc0cf675fda3882
This commit is contained in:
drh
2010-05-01 11:19:07 +00:00
parent bb16ff75dd
commit 7aba8fdef7
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
manifest
View File

@@ -1,5 +1,8 @@
C Add\stest\scase\sdemonstrating\sdeadlock\sduring\srecovery\sof\svery\slarge\slog\sfiles.\sNo\sfix\syet. -----BEGIN PGP SIGNED MESSAGE-----
D 2010-05-01T08:30:35 Hash: SHA1
C Fix\sthe\ssqlite3_mutex_alloc()\sinterface\sto\sreturn\sNULL\s(not\ssegfault)\swhen\noperating\sin\sthreadsafe\smode.\s\s(This\sis\sa\sgeneral-purpose\sbug\sfix\swhich\nreally\sought\sto\sbe\sported\sto\strunk.)
D 2010-05-01T11:19:08
F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb F Makefile.in d83a0ffef3dcbfb08b410a6c6dd6c009ec9167fb
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -139,7 +142,7 @@ F src/mem2.c 2ee7bdacda8299b5a91cff9f7ee3e46573195c38
F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3 F src/mem3.c 9b237d911ba9904142a804be727cc6664873f8a3
F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff F src/mem5.c eb7a5cb98915dd7a086fa415ce3a5a0f20d0acff
F src/memjournal.c f3be374af30588de297dcf678925b2a4758e4135 F src/memjournal.c f3be374af30588de297dcf678925b2a4758e4135
F src/mutex.c 581a272e09098040ca3ef543cb5f3d643eff7d50 F src/mutex.c c04412513619b3a763f3484bb412336fa3a3fbd9
F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6 F src/mutex.h 6fde601e55fa6c3fae768783c439797ab84c87c6
F src/mutex_noop.c 5f58eaa31f2d742cb8957a747f7887ae98f16053 F src/mutex_noop.c 5f58eaa31f2d742cb8957a747f7887ae98f16053
F src/mutex_os2.c 20477db50cf3817c2f1cd3eb61e5c177e50231db F src/mutex_os2.c 20477db50cf3817c2f1cd3eb61e5c177e50231db
@@ -808,7 +811,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 d1fcccecdc8e9ac5d0d022914e51c545f4e1b04f P 63ea318eb19d264667909c70185b8a5cdc4454c0
R 034d4495629d0958f2c325287d33624b R 2100e665be505fa1cf8f47333c26bc0b
U dan U drh
Z 43bb63963c222b2fa1b30185cbd547d7 Z 344033a82b2442e0392cbcdded1532fa
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
iD8DBQFL3A4voxKgR168RlERAlUnAJ0S3R/Dfykt3Oi2UMidrwOa0L6Q6gCfe8MG
dPCr8yJsMbepoEqgAok4Aos=
=yH/M
-----END PGP SIGNATURE-----

2
manifest.uuid
View File

@@ -1 +1 @@
63ea318eb19d264667909c70185b8a5cdc4454c0 64840a3caf569959c9d5e63bdbc0cf675fda3882

1
src/mutex.c
View File

@@ -77,6 +77,7 @@ int sqlite3MutexEnd(void){
** Retrieve a pointer to a static mutex or allocate a new dynamic one. ** Retrieve a pointer to a static mutex or allocate a new dynamic one.
*/ */
sqlite3_mutex *sqlite3_mutex_alloc(int id){ sqlite3_mutex *sqlite3_mutex_alloc(int id){
if( !sqlite3GlobalConfig.bCoreMutex ) return 0;
#ifndef SQLITE_OMIT_AUTOINIT #ifndef SQLITE_OMIT_AUTOINIT
if( sqlite3_initialize() ) return 0; if( sqlite3_initialize() ) return 0;
#endif #endif