File sqlite3-CVE-2018-8740.patch of Package sqlite3.10484

Overview Repositories Revisions Requests Users Attributes Meta

File sqlite3-CVE-2018-8740.patch of Package sqlite3.10484

--- sqlite3.c.orig
+++ sqlite3.c
@@ -92635,8 +92635,6 @@ SQLITE_PRIVATE void sqlite3EndTable(
   p = pParse->pNewTable;
   if( p==0 ) return;
 
-  assert( !db->init.busy || !pSelect );
-
   /* If the db->init.busy is 1 it means we are reading the SQL off the
   ** "sqlite_master" or "sqlite_temp_master" table on the disk.
   ** So do not write to the disk again.  Extract the root page number
@@ -92644,6 +92642,10 @@ SQLITE_PRIVATE void sqlite3EndTable(
   ** should have been put there by the sqliteOpenCb routine.)
   */
   if( db->init.busy ){
+    if( pSelect ){
+      sqlite3ErrorMsg(pParse, "");
+      return;
+    }
     p->tnum = db->init.newTnum;
   }
 
@@ -105610,7 +105612,7 @@ static void corruptSchema(
     if( zObj==0 ) zObj = "?";
     sqlite3SetString(pData->pzErrMsg, db,
       "malformed database schema (%s)", zObj);
-    if( zExtra ){
+    if( zExtra && zExtra[0] ){
       *pData->pzErrMsg = sqlite3MAppendf(db, *pData->pzErrMsg, 
                                  "%s - %s", *pData->pzErrMsg, zExtra);
     }

Places

File sqlite3-CVE-2018-8740.patch of Package sqlite3.10484

Places