Make sure sqlite3_open16() always zeros the db return pointer if

SQLite initialization fails. (CVS 6552)

FossilOrigin-Name: 057c7d171397e19c8f3ac2362ea45f2b4a50530c

diff --git a/manifest b/manifest
index 28ac359f6ce88262407d15c8cf3bf164a0fbc36e..f36eeecafb0fe8b944e5a344325195b72dce82c0 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enhance\ssqlite3_complete()\sso\sthat\sit\sunderstands\sEXPLAIN\sQUERY\sPLAN.\nTicket\s#3828.\s\sTesting\sis\sdone\sin\sTH3.\s(CVS\s6551)
-D 2009-04-28T04:46:42
+C Make\ssure\ssqlite3_open16()\salways\szeros\sthe\sdb\sreturn\spointer\sif\nSQLite\sinitialization\sfails.\s(CVS\s6552)
+D 2009-04-28T04:47:31
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -125,7 +125,7 @@ F src/insert.c 71286d081a919a27ef22eaeccbe2718f93dc6aa9
 F src/journal.c e00df0c0da8413ab6e1bb7d7cab5665d4a9000d0
 F src/legacy.c 2ad5b52df322d0f132f66817095e0e79c8942611
 F src/loadext.c 3f96631089fc4f3871a67f02f2e4fc7ea4d51edc
-F src/main.c a3270aeabcfa2fafea04ab42778eaa68ff39eeaa
+F src/main.c 4a2f8f362eca72237b30c89a240d0e8ca08d1df0
 F src/malloc.c a1f0f8ae110abb8eb546e259ab0eaea7e0f9b588
 F src/mem0.c f2f84062d1f35814d6535c9f9e33de3bfb3b132c
 F src/mem1.c e6d5c23941288df8191b8a98c28e3f57771e2270
@@ -725,7 +725,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P cb9af8293624da35c32077d0f46d5b0cf826dcf5
-R 29362f14accb0aefdfae56392667b017
+P 3ac1b15f552fe005630e43a92fffa6a4abd6675d
+R ce7ad2cfeceaae4924fa46a2e9663c12
 U drh
-Z f32762b49f5169b76aacbd00a2796275
+Z fff0fc60f9b3711ffd15eacee148c143

diff --git a/manifest.uuid b/manifest.uuid
index 6615d47ba632f72aa29a00a7513eb68dbc981f91..509e3d8ef5a5f3ac8c59570bdf9aaa80fd498e84 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3ac1b15f552fe005630e43a92fffa6a4abd6675d
\ No newline at end of file
+057c7d171397e19c8f3ac2362ea45f2b4a50530c
\ No newline at end of file

diff --git a/src/main.c b/src/main.c
index b5adcd49c3b0027308f28918415914435ca0f8f3..5eeac1f79d319d7a06179932b88d2794bcf00444 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.540 2009/04/27 18:46:06 drh Exp $
+** $Id: main.c,v 1.541 2009/04/28 04:47:31 drh Exp $
 */
 #include "sqliteInt.h"
 
@@ -1511,6 +1511,7 @@ static int openDatabase(
   CollSeq *pColl;
   int isThreadsafe;
 
+  *ppDb = 0;
 #ifndef SQLITE_OMIT_AUTOINIT
   rc = sqlite3_initialize();
   if( rc ) return rc;