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/build.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/build.c')
| -rw-r--r-- | src/build.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/build.c b/src/build.c index b897494db..0b4affc66 100644 --- a/src/build.c +++ b/src/build.c @@ -307,7 +307,11 @@ int sqlite3UserAuthTable(const char *zTable){ Table *sqlite3FindTable(sqlite3 *db, const char *zName, const char *zDatabase){ Table *p = 0; int i; - assert( zName!=0 ); + +#ifdef SQLITE_ENABLE_API_ARMOR + if( !sqlite3SafetyCheckOk(db) || zName==0 ) return 0; +#endif + /* All mutexes are required for schema access. Make sure we hold them. */ assert( zDatabase!=0 || sqlite3BtreeHoldsAllMutexes(db) ); #if SQLITE_USER_AUTHENTICATION |