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

Fix a problem in the shell tool. In some cases sqlite3_errmsg() was being called before sqlite3_finalize(), causing error messages to be more generic than they should be.

Browse Source 
FossilOrigin-Name: e5d07045fabe0803715cfb291aa9e971235cb08a
This commit is contained in:
dan
2010-01-05 04:59:56 +00:00
parent 10f864e8ef
commit 4564cedd80
5 changed files with 38 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/shell.c
View File

@@ -1833,10 +1833,9 @@ static int shell_exec(
struct callback_data *pArg, /* Pointer to struct callback_data */
char **pzErrMsg /* Error msg written here */
){
sqlite3_stmt *pStmt = NULL;
int rc = SQLITE_OK;
int rc2;
const char *zLeftover; /* Tail of unprocessed SQL */
sqlite3_stmt *pStmt = NULL; /* Statement to execute. */
int rc = SQLITE_OK; /* Return Code */
const char *zLeftover; /* Tail of unprocessed SQL */
if( pzErrMsg ){
*pzErrMsg = NULL;
@@ -1917,28 +1916,15 @@ static int shell_exec(
}
}
/* if the last sqlite3_step() didn't complete successfully... */
if( (SQLITE_OK != rc) && (SQLITE_DONE != rc) ){
if( pzErrMsg ){
*pzErrMsg = save_err_msg(db);
}
}else{
rc = SQLITE_OK;
}
rc2 = sqlite3_finalize(pStmt);
/* if the last sqlite3_finalize() didn't complete successfully
** AND we don't have a saved error from sqlite3_step ... */
if( (SQLITE_OK != rc2) && (SQLITE_OK == rc) ){
rc = rc2;
if( pzErrMsg ){
*pzErrMsg = save_err_msg(db);
}
}
if( SQLITE_OK == rc ){
/* Finalize the statement just executed. If this fails, save a
** copy of the error message. Otherwise, set zSql to point to the
** next statement to execute. */
rc = sqlite3_finalize(pStmt);
if( rc==SQLITE_OK ){
zSql = zLeftover;
while( isspace(zSql[0]) ) zSql++;
}else if( pzErrMsg ){
*pzErrMsg = save_err_msg(db);
}
}
} /* end while */