database/sqlite
1
0
Fork 0
mirror of https://github.com/sqlite/sqlite.git synced 2025-11-05 04:30:38 +03:00
Code Activity

Do not segfault in the CLI if sqlite3_open() fails to create a

Browse Source 
database connection object.  Ticket #3096. (CVS 5084)

FossilOrigin-Name: 0bec7ebf41e9f52d3ef0449e27e3d631abfe948b
This commit is contained in:
drh
2008-05-05 16:27:24 +00:00
parent 52b472aebf
commit 4cea5baed6
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
manifest
View File

@@ -1,5 +1,5 @@
C If\san\sIO\serror\soccurs\swhile\slocking\sthe\sdatabase\sand\schecking\sthe\scache\svalidity,\sunlock\sthe\sdatabase\sbefore\sreturning.\sTicket\s#3030.\s(CVS\s5083) C Do\snot\ssegfault\sin\sthe\sCLI\sif\ssqlite3_open()\sfails\sto\screate\sa\ndatabase\sconnection\sobject.\s\sTicket\s#3096.\s(CVS\s5084)
D 2008-05-05T16:23:55 D 2008-05-05T16:27:24
F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7 F Makefile.arm-wince-mingw32ce-gcc ac5f7b2cef0cd850d6f755ba6ee4ab961b1fadf7
F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952 F Makefile.in 25b3282a4ac39388632c2fb0e044ff494d490952
F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -131,7 +131,7 @@ F src/printf.c 77c192ccc81117d68b21b449cd33396357aa266d
F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a F src/random.c 2b2db2de4ab491f5a14d3480466f8f4b5a5db74a
F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8 F src/select.c da43ce3080112aa77863e9c570c1df19a892acb8
F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96 F src/server.c 087b92a39d883e3fa113cae259d64e4c7438bc96
F src/shell.c be22ec05c8c4a43a95a6ad3b8068542200451e07 F src/shell.c 668ad976716982eb658019eda489b6f55131dbe7
F src/sqlite.h.in abb785d2afcf45bb9344fe6edc1c7b428e1b719f F src/sqlite.h.in abb785d2afcf45bb9344fe6edc1c7b428e1b719f
F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3 F src/sqlite3ext.h faacd0e6a81aabee0861c6d7883c9172e74ef5b3
F src/sqliteInt.h 6dbffa746c569b992e76051565d3531a07a54669 F src/sqliteInt.h 6dbffa746c569b992e76051565d3531a07a54669
@@ -634,7 +634,7 @@ F www/tclsqlite.tcl 8be95ee6dba05eabcd27a9d91331c803f2ce2130
F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0 F www/vdbe.tcl 87a31ace769f20d3627a64fa1fade7fed47b90d0
F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b F www/version3.tcl 890248cf7b70e60c383b0e84d77d5132b3ead42b
F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5 F www/whentouse.tcl fc46eae081251c3c181bd79c5faef8195d7991a5
P 198c395b01140ef48b6913c00188ba7168bfb081 P 4ad1809192b616d1c12499825bcd0967dea76864
R 6e0e093a0f17c8e821e8c74c11e266a3 R bfbe4f20e4711eac7660528cdf81900f
U danielk1977 U drh
Z 67d910e4d419f070999a506a26c6b1be Z 282ac40d5061e73766d751c019b02dae

2
manifest.uuid
View File

@@ -1 +1 @@
4ad1809192b616d1c12499825bcd0967dea76864 0bec7ebf41e9f52d3ef0449e27e3d631abfe948b

10
src/shell.c
View File

@@ -12,7 +12,7 @@
** This file contains code to implement the "sqlite" command line ** This file contains code to implement the "sqlite" command line
** utility for accessing SQLite databases. ** utility for accessing SQLite databases.
** **
** $Id: shell.c,v 1.177 2008/04/15 18:50:02 pweilbacher Exp $ ** $Id: shell.c,v 1.178 2008/05/05 16:27:24 drh Exp $
*/ */
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -955,9 +955,11 @@ static void open_db(struct callback_data *p){
if( p->db==0 ){ if( p->db==0 ){
sqlite3_open(p->zDbFilename, &p->db); sqlite3_open(p->zDbFilename, &p->db);
db = p->db; db = p->db;
sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0, if( db && sqlite3_errcode(db)==SQLITE_OK ){
shellstaticFunc, 0, 0); sqlite3_create_function(db, "shellstatic", 0, SQLITE_UTF8, 0,
if( SQLITE_OK!=sqlite3_errcode(db) ){ shellstaticFunc, 0, 0);
}
if( db==0 || SQLITE_OK!=sqlite3_errcode(db) ){
fprintf(stderr,"Unable to open database \"%s\": %s\n", fprintf(stderr,"Unable to open database \"%s\": %s\n",
p->zDbFilename, sqlite3_errmsg(db)); p->zDbFilename, sqlite3_errmsg(db));
exit(1); exit(1);