commit 61c7f59c10d6fdad7069e9295e64e9be0bc01846
author dan <dan@noemail.net> Tue Oct 26 18:42:52 2010 +0000
committer dan <dan@noemail.net> Tue Oct 26 18:42:52 2010 +0000
tree d83b4a15f9fd505857783a10af4c6bd50b56e31b
parent e3d82a872317dd0c2439d12147bcff5699c191a7

Structural coverage tests for vdbeblob.c. Including experimental new API sqlite3_blob_reopen().

FossilOrigin-Name: 97c6b2616ddcce2337778c6ee88a973cc4fe999d

src/vdbeblob.c

diff --git a/src/vdbeblob.c b/src/vdbeblob.c
index 1bfce65..f43fc64 100644
--- a/src/vdbeblob.c
+++ b/src/vdbeblob.c
@@ -150,12 +150,11 @@
     {OP_Halt, 0, 0, 0},            /* 11 */
   };
 
-  Vdbe *v = 0;
   int rc = SQLITE_OK;
   char *zErr = 0;
   Table *pTab;
-  Parse *pParse;
-  Incrblob *pBlob;
+  Parse *pParse = 0;
+  Incrblob *pBlob = 0;
 
   flags = !!flags;                /* flags = (flags ? 1 : 0); */
   *ppBlob = 0;
@@ -163,15 +162,15 @@
   sqlite3_mutex_enter(db->mutex);
 
   pBlob = (Incrblob *)sqlite3DbMallocZero(db, sizeof(Incrblob));
+  if( !pBlob ) goto blob_open_out;
   pParse = sqlite3StackAllocRaw(db, sizeof(*pParse));
-  if( pParse==0 || pBlob==0 ){
-    assert( db->mallocFailed );
-    goto blob_open_out;
-  }
+  if( !pParse ) goto blob_open_out;
 
   do {
     memset(pParse, 0, sizeof(Parse));
     pParse->db = db;
+    sqlite3DbFree(db, zErr);
+    zErr = 0;
 
     sqlite3BtreeEnterAll(db);
     pTab = sqlite3LocateTable(pParse, 0, zTable, zDb);
@@ -197,7 +196,7 @@
     }
 
     /* Now search pTab for the exact column. */
-    for(iCol=0; iCol < pTab->nCol; iCol++) {
+    for(iCol=0; iCol<pTab->nCol; iCol++) {
       if( sqlite3StrICmp(pTab->aCol[iCol].zName, zColumn)==0 ){
         break;
       }
@@ -251,11 +250,15 @@
       }
     }
 
-    v = sqlite3VdbeCreate(db);
-    if( v ){
+    pBlob->pStmt = (sqlite3_stmt *)sqlite3VdbeCreate(db);
+    assert( pBlob->pStmt || db->mallocFailed );
+    if( pBlob->pStmt ){
+      Vdbe *v = (Vdbe *)pBlob->pStmt;
       int iDb = sqlite3SchemaToIndex(db, pTab->pSchema);
+
       sqlite3VdbeAddOpList(v, sizeof(openBlob)/sizeof(VdbeOpList), openBlob);
 
+
       /* Configure the OP_Transaction */
       sqlite3VdbeChangeP1(v, 0, iDb);
       sqlite3VdbeChangeP2(v, 0, flags);
@@ -298,11 +301,9 @@
     }
    
     pBlob->flags = flags;
-    pBlob->pStmt = (sqlite3_stmt *)v;
     pBlob->iCol = iCol;
     pBlob->db = db;
     sqlite3BtreeLeaveAll(db);
-    v = 0;
     if( db->mallocFailed ){
       goto blob_open_out;
     }
@@ -314,7 +315,6 @@
   if( rc==SQLITE_OK && db->mallocFailed==0 ){
     *ppBlob = (sqlite3_blob *)pBlob;
   }else{
-    if( v ) sqlite3VdbeFinalize(v);
     if( pBlob && pBlob->pStmt ) sqlite3VdbeFinalize((Vdbe *)pBlob->pStmt);
     sqlite3DbFree(db, pBlob);
   }