Change sqlite3ApiExit() so that its first argument is never NULL.

FossilOrigin-Name: 791b706ec6c3e80885666e48e01524f0e9a7557e

diff --git a/manifest b/manifest
index 4290efa1418826f1029938785f07512ee8457cbc..0c3d3a246e120dd72837d34c2f03928b0a586634 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Put\sBtCursor\sobjects\son\sa\ssingly-linked\slist\sinstead\sof\sa\sdoubly-linked\slist.\nAdd\sthe\sBTCF_Multiple\sflag.\s\sOnly\sinvoke\ssaveAllCursors()\swhen\susing\sa\scursor\nthat\shas\sBTCF_Multiple\sset.
-D 2015-06-30T02:47:36.537
+C Change\ssqlite3ApiExit()\sso\sthat\sits\sfirst\sargument\sis\snever\sNULL.
+D 2015-06-30T03:13:47.365
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in 285a0a234ed7610d431d91671c136098c2bd86a9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -274,7 +274,7 @@ F src/btree.h 969adc948e89e449220ff0ff724c94bb2a52e9f1
 F src/btreeInt.h e4eabc722b1ae017ac9c266a75769d4c6a9afde6
 F src/build.c b3f15255d5b16e42dafeaa638fd4f8a47c94ed70
 F src/callback.c 7b44ce59674338ad48b0e84e7b72f935ea4f68b0
-F src/complete.c a5cf5b4b56390cfb7b8636e8f7ddef90258dd575
+F src/complete.c addcd8160b081131005d5bc2d34adf20c1c5c92f
 F src/ctime.c 5a0b735dc95604766f5dac73973658eef782ee8b
 F src/date.c e4d50b3283696836ec1036b695ead9a19e37a5ac
 F src/dbstat.c f402e77e25089c6003d0c60b3233b9b3947d599a
@@ -292,8 +292,8 @@ F src/journal.c b4124532212b6952f42eb2c12fa3c25701d8ba8d
 F src/legacy.c ba1863ea58c4c840335a84ec276fc2b25e22bc4e
 F src/lempar.c 92bafa308607dd985ca389a788cd9e0a2b608712
 F src/loadext.c e722f4b832f923744788365df5fb8515c0bc8a47
-F src/main.c c0061a4f8ba86f957534be93b7026dab324f12c2
-F src/malloc.c 908c780fdddd472163c2d1b1820ae4081f01ad20
+F src/main.c 92d79bfa1a36c7c554700bb58eb8327abff1ac5c
+F src/malloc.c 9be4e645f2fb411e5a04cf97e91f68b4faa6dc81
 F src/mem0.c 6a55ebe57c46ca1a7d98da93aaa07f99f1059645
 F src/mem1.c abe6ee469b6c5a35c7f22bfeb9c9bac664a1c987
 F src/mem2.c f1940d9e91948dd6a908fbb9ce3835c36b5d83c3
@@ -1364,7 +1364,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P ed54c14ea8a72d69d69e0c0d7f6936f54efc04c2
-R f3f8b025f26bf8ce4de670023e83b4e0
+P 429ccef2b36fc46e92914eb54afd5f800b1a40ff
+R 76fff8f8ba7a3e292fd9a942df7fcd8e
 U drh
-Z aa2cb7c94aea3021edb11ed06abf028f
+Z f5ae2d48a4b628f4b044b90e76fe7af0

diff --git a/manifest.uuid b/manifest.uuid
index 556c262e4cf815682de9b81b72e1e7e9f7f64558..952f484670f0038a273a23282fba32b326494db1 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-429ccef2b36fc46e92914eb54afd5f800b1a40ff
\ No newline at end of file
+791b706ec6c3e80885666e48e01524f0e9a7557e
\ No newline at end of file

diff --git a/src/complete.c b/src/complete.c
index a12184e64d6ed7b43fa6e6ed7fdb7fd5f4e6afc1..b120b7e811d915c941e682dfefbb094a58be1458 100644 (file)
--- a/src/complete.c
+++ b/src/complete.c
@@ -284,7 +284,7 @@ int sqlite3_complete16(const void *zSql){
     rc = SQLITE_NOMEM;
   }
   sqlite3ValueFree(pVal);
-  return sqlite3ApiExit(0, rc);
+  return rc & 0xff;
 }
 #endif /* SQLITE_OMIT_UTF16 */
 #endif /* SQLITE_OMIT_COMPLETE */

diff --git a/src/main.c b/src/main.c
index c047943c93b536f4caadbfed051c2d33363fc7f1..faeee6af2ef7408dfac7013e36ca83fb8d6db250 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -2928,7 +2928,7 @@ opendb_out:
     sqlite3GlobalConfig.xSqllog(pArg, db, zFilename, 0);
   }
 #endif
-  return sqlite3ApiExit(0, rc);
+  return rc & 0xff;
 }
 
 /*
@@ -2986,7 +2986,7 @@ int sqlite3_open16(
   }
   sqlite3ValueFree(pVal);
 
-  return sqlite3ApiExit(0, rc);
+  return rc & 0xff;
 }
 #endif /* SQLITE_OMIT_UTF16 */
 

diff --git a/src/malloc.c b/src/malloc.c
index 1b9a20956b8413b52ccdc338da4f29fa270f7216..97b9cd5778bb5fb3008697db7425786391716d79 100644 (file)
--- a/src/malloc.c
+++ b/src/malloc.c
@@ -796,17 +796,16 @@ static SQLITE_NOINLINE int apiOomError(sqlite3 *db){
 ** function. However, if a malloc() failure has occurred since the previous
 ** invocation SQLITE_NOMEM is returned instead. 
 **
-** If the first argument, db, is not NULL and a malloc() error has occurred,
-** then the connection error-code (the value returned by sqlite3_errcode())
-** is set to SQLITE_NOMEM.
+** If an OOM as occurred, then the connection error-code (the value
+** returned by sqlite3_errcode()) is set to SQLITE_NOMEM.
 */
 int sqlite3ApiExit(sqlite3* db, int rc){
-  /* If the db handle is not NULL, then we must hold the connection handle
-  ** mutex here. Otherwise the read (and possible write) of db->mallocFailed 
+  /* If the db handle must hold the connection handle mutex here.
+  ** Otherwise the read (and possible write) of db->mallocFailed 
   ** is unsafe, as is the call to sqlite3Error().
   */
-  assert( !db || sqlite3_mutex_held(db->mutex) );
-  if( db==0 ) return rc & 0xff;
+  assert( db!=0 );
+  assert( sqlite3_mutex_held(db->mutex) );
   if( db->mallocFailed || rc==SQLITE_IOERR_NOMEM ){
     return apiOomError(db);
   }