diff options
| author | drh <drh@noemail.net> | 2014-10-31 14:53:32 +0000 |
|---|---|---|
| committer | drh <drh@noemail.net> | 2014-10-31 14:53:32 +0000 |
| commit | ca3e10ea37c4808fa84063f06b02229801b28cc0 (patch) | |
| tree | 25f7d9b2ab4ff71311882bcee951b6e9ab1cb62f /src/status.c | |
| parent | bc2866ca7abc2ad7cbb6878d65cd18e584cff8f5 (diff) | |
| parent | 0fb5daed34ba6f16d761b8ad02b944ec59cf5c03 (diff) | |
| download | sqlite-ca3e10ea37c4808fa84063f06b02229801b28cc0.tar.gz sqlite-ca3e10ea37c4808fa84063f06b02229801b28cc0.zip | |
Merge recent trunk enhancements, and in particular the improvements to
the b-tree balancing logic, into the sessions branch.
FossilOrigin-Name: 28b044a51215a3f64dafb2cf3b6cb7d2029580ef
Diffstat (limited to 'src/status.c')
| -rw-r--r-- | src/status.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/status.c b/src/status.c index 79a8001b8..4c2eabb66 100644 --- a/src/status.c +++ b/src/status.c @@ -86,6 +86,9 @@ int sqlite3_status(int op, int *pCurrent, int *pHighwater, int resetFlag){ if( op<0 || op>=ArraySize(wsdStat.nowValue) ){ return SQLITE_MISUSE_BKPT; } +#ifdef SQLITE_ENABLE_API_ARMOR + if( pCurrent==0 || pHighwater==0 ) return SQLITE_MISUSE_BKPT; +#endif *pCurrent = wsdStat.nowValue[op]; *pHighwater = wsdStat.mxValue[op]; if( resetFlag ){ @@ -105,6 +108,11 @@ int sqlite3_db_status( int resetFlag /* Reset high-water mark if true */ ){ int rc = SQLITE_OK; /* Return code */ +#ifdef SQLITE_ENABLE_API_ARMOR + if( !sqlite3SafetyCheckOk(db) || pCurrent==0|| pHighwater==0 ){ + return SQLITE_MISUSE_BKPT; + } +#endif sqlite3_mutex_enter(db->mutex); switch( op ){ case SQLITE_DBSTATUS_LOOKASIDE_USED: { |