Permit sqlite3_shutdown() to be called with OMIT_WSD enabled and without having calle...

FossilOrigin-Name: 3f7dbdb5df38bd4b8cd49d22a23b8412b8d506e5

diff --git a/manifest b/manifest
index eb52499b91ef3a53b562ece41ed420bed81b8689..46ba432235774ffb315872e9ffa4008762583cec 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\ssegfault\sfollowing\sOOM\serror\sin\sthe\stest\sharness.\s\sThe\nSQLite\score\sitself\sis\snot\sat\sfault.
-D 2014-12-23T20:05:19.241
+C Permit\ssqlite3_shutdown()\sto\sbe\scalled\swith\sOMIT_WSD\senabled\sand\swithout\shaving\scalled\ssqlite3_initialize()\sfirst.
+D 2014-12-23T20:42:48.779
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 6c4f961fa91d0b4fa121946a19f9e5eac2f2f809
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -195,7 +195,7 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 7274c97d24bb46631e504332ccd3bd1b37841770
 F src/loadext.c 86bd4e2fccd520b748cba52492ab60c4a770f660
-F src/main.c ee498c89735ba7b581fbd58d2ad2e7679a0475b2
+F src/main.c 784f3d613f08d8bfba238a5baa7398770a641de2
 F src/malloc.c 740db54387204c9a2eb67c6d98e68b08e9ef4eab
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c faf615aafd8be74a71494dfa027c113ea5c6615f
@@ -1234,7 +1234,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P a08b0c7512287ce5ae3fffe02c092d0eb25b3a25
-R 6f17c6ca29a22c9a696402dcec6c7766
-U drh
-Z 3a6a677c416cfd077a0efd463f488c83
+P 1bb26695ff28a96d740752e327c2e0a0da1d067e
+R 69846a8eed33bdc4ac13d4f2cdf5a199
+U mistachkin
+Z c9331cbf8b5ecd4eca34d95e3015ec1f

diff --git a/manifest.uuid b/manifest.uuid
index 83787366b010fb46301c5e0c4243ce4397e790a6..5e20eb47ce857e6d5140fb6be54314a0cb64c895 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-1bb26695ff28a96d740752e327c2e0a0da1d067e
\ No newline at end of file
+3f7dbdb5df38bd4b8cd49d22a23b8412b8d506e5
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index 76af9a2e955d6f123f0c8e1dc1a61efeab8c2322..16e9a1babb5b6fecbeaac067455c3eacf5d8d0b9 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -271,6 +271,13 @@ int sqlite3_initialize(void){
 ** when this routine is invoked, then this routine is a harmless no-op.
 */
 int sqlite3_shutdown(void){
+#ifdef SQLITE_OMIT_WSD
+  int rc = sqlite3_wsd_init(4096, 24);
+  if( rc!=SQLITE_OK ){
+    return rc;
+  }
+#endif
+
   if( sqlite3GlobalConfig.isInit ){
 #ifdef SQLITE_EXTRA_SHUTDOWN
     void SQLITE_EXTRA_SHUTDOWN(void);