diff options
| author | drh <drh@noemail.net> | 2015-02-21 15:13:50 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2015-02-21 15:13:50 +0000 |
| commit | 878acb32efa879e0b680cce08f63e65f89fa4f77 (patch) | |
| tree | 84f334c6f75c248e10f9a92c17e3dae631f2c597 /src/main.c | |
| parent | 1ee4a2dd88663517c8dd980926af9e76f37c88fb (diff) | |
| parent | 2da47d38691b74a6cfa2ce2e5bdce3bb7d8fc186 (diff) | |
| download | sqlite-878acb32efa879e0b680cce08f63e65f89fa4f77.tar.gz sqlite-878acb32efa879e0b680cce08f63e65f89fa4f77.zip | |
Merge all recent trunk changes into the sessions branch.
FossilOrigin-Name: f36bb5fa5c5e3430808fe35d58f45559a216d341
Diffstat (limited to 'src/main.c')
| -rw-r--r-- | src/main.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/main.c b/src/main.c index af5203d5d..9c85e0ae9 100644 --- a/src/main.c +++ b/src/main.c @@ -1414,7 +1414,7 @@ int sqlite3_busy_handler( void *pArg ){ #ifdef SQLITE_ENABLE_API_ARMOR - if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE; + if( !sqlite3SafetyCheckOk(db) ) return SQLITE_MISUSE_BKPT; #endif sqlite3_mutex_enter(db->mutex); db->busyHandler.xFunc = xBusy; @@ -2728,6 +2728,9 @@ static int openDatabase( #if !defined(SQLITE_DEFAULT_AUTOMATIC_INDEX) || SQLITE_DEFAULT_AUTOMATIC_INDEX | SQLITE_AutoIndex #endif +#if SQLITE_DEFAULT_CKPTFULLFSYNC + | SQLITE_CkptFullFSync +#endif #if SQLITE_DEFAULT_FILE_FORMAT<4 | SQLITE_LegacyFileFmt #endif @@ -3163,13 +3166,19 @@ int sqlite3_table_column_metadata( Table *pTab = 0; Column *pCol = 0; int iCol = 0; - char const *zDataType = 0; char const *zCollSeq = 0; int notnull = 0; int primarykey = 0; int autoinc = 0; + +#ifdef SQLITE_ENABLE_API_ARMOR + if( !sqlite3SafetyCheckOk(db) || zTableName==0 ){ + return SQLITE_MISUSE_BKPT; + } +#endif + /* Ensure the database schema has been loaded */ sqlite3_mutex_enter(db->mutex); sqlite3BtreeEnterAll(db); @@ -3316,7 +3325,7 @@ int sqlite3_file_control(sqlite3 *db, const char *zDbName, int op, void *pArg){ sqlite3BtreeLeave(pBtree); } sqlite3_mutex_leave(db->mutex); - return rc; + return rc; } /* |