commit ae7fc49deffe4bcc728a210199354e4b2dae9c9c
author danielk1977 <danielk1977@noemail.net> Thu Mar 29 15:00:52 2007 +0000
committer danielk1977 <danielk1977@noemail.net> Thu Mar 29 15:00:52 2007 +0000
tree 810d025739f16f7339ee917ea05f7a329766682b
parent 42242ded5e85845a91df15338305f82330205a3b

Assume the malloc-failed flag cannot already be set when calling sqlite3_errmsg(16)(). (CVS 3745)

FossilOrigin-Name: 54fa22273d551e00e1abd86992ff7c62ec4e0daf

src/main.c

diff --git a/src/main.c b/src/main.c
index 46d8c99..57833ff 100644
--- a/src/main.c
+++ b/src/main.c
@@ -14,7 +14,7 @@
 ** other files are for internal use by SQLite and should not be
 ** accessed by users of the library.
 **
-** $Id: main.c,v 1.362 2007/03/27 22:24:11 drh Exp $
+** $Id: main.c,v 1.363 2007/03/29 15:00:53 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include "os.h"
@@ -730,7 +730,8 @@
 */
 const char *sqlite3_errmsg(sqlite3 *db){
   const char *z;
-  if( !db || sqlite3MallocFailed() ){
+  assert( !sqlite3MallocFailed() );
+  if( !db ){
     return sqlite3ErrStr(SQLITE_NOMEM);
   }
   if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){
@@ -769,7 +770,8 @@
   };
 
   const void *z;
-  if( sqlite3MallocFailed() ){
+  assert( !sqlite3MallocFailed() );
+  if( !db ){
     return (void *)(&outOfMemBe[SQLITE_UTF16NATIVE==SQLITE_UTF16LE?1:0]);
   }
   if( sqlite3SafetyCheck(db) || db->errCode==SQLITE_MISUSE ){