commit 7dabaa126a81380fa1391570c24c5bd34c1e5943
author danielk1977 <danielk1977@noemail.net> Tue Jun 13 04:11:43 2006 +0000
committer danielk1977 <danielk1977@noemail.net> Tue Jun 13 04:11:43 2006 +0000
tree c47d18fe928c34f5c77847cdcacd6625b473556d
parent a967e88645cbb47db0c24fc5490821b287db45c8

Bugfixes: Fix a segfault introduced as part of the new vtab code, deallocate memory in the Destroy() method of the echo module. (CVS 3221)

FossilOrigin-Name: f9ea9704755eee3fd29af7a47be1d41620be8835

src/expr.c

diff --git a/src/expr.c b/src/expr.c
index 94eb8ec..d9f24c3 100644
--- a/src/expr.c
+++ b/src/expr.c
@@ -12,7 +12,7 @@
 ** This file contains routines used for analyzing expressions and
 ** for generating VDBE code that evaluates expressions in SQLite.
 **
-** $Id: expr.c,v 1.260 2006/06/13 01:04:52 drh Exp $
+** $Id: expr.c,v 1.261 2006/06/13 04:11:44 danielk1977 Exp $
 */
 #include "sqliteInt.h"
 #include <ctype.h>
@@ -1489,8 +1489,8 @@
       }else if( pExpr->iColumn>=0 ){
         Table *pTab = pExpr->pTab;
         int iCol = pExpr->iColumn;
-        sqlite3VdbeAddOp(v, pTab->isVirtual ? OP_VColumn : OP_Column,
-                            pExpr->iTable, iCol);
+        int op = (pTab && pTab->isVirtual) ? OP_VColumn : OP_Column;
+        sqlite3VdbeAddOp(v, op, pExpr->iTable, iCol);
         sqlite3ColumnDefault(v, pTab, iCol);
 #ifndef SQLITE_OMIT_FLOATING_POINT
         if( pTab && pTab->aCol[iCol].affinity==SQLITE_AFF_REAL ){
@@ -1498,8 +1498,9 @@
         }
 #endif
       }else{
-        sqlite3VdbeAddOp(v, pExpr->pTab->isVirtual ? OP_VRowid : OP_Rowid,
-                         pExpr->iTable, 0);
+        Table *pTab = pExpr->pTab;
+        int op = (pTab && pTab->isVirtual) ? OP_VRowid : OP_Rowid;
+        sqlite3VdbeAddOp(v, op, pExpr->iTable, 0);
       }
       break;
     }