Index: ext/fts3/fts3.c
==================================================================
--- ext/fts3/fts3.c
+++ ext/fts3/fts3.c
@@ -331,10 +331,13 @@
 }
 
 #define GETVARINT_STEP(v, ptr, shift, mask1, mask2, var, ret) \
   v = (v & mask1) | ( (*ptr++) << shift );                    \
   if( (v & mask2)==0 ){ var = v; return ret; }
+#define GETVARINT_INIT(v, ptr, shift, mask1, mask2, var, ret) \
+  v = (*ptr++);                                               \
+  if( (v & mask2)==0 ){ var = v; return ret; }
 
 /* 
 ** Read a 64-bit variable-length integer from memory starting at p[0].
 ** Return the number of bytes read, or 0 on error.
 ** The value is stored in *v.
@@ -343,11 +346,11 @@
   const char *pStart = p;
   u32 a;
   u64 b;
   int shift;
 
-  GETVARINT_STEP(a, p, 0,  0x00,     0x80, *v, 1);
+  GETVARINT_INIT(a, p, 0,  0x00,     0x80, *v, 1);
   GETVARINT_STEP(a, p, 7,  0x7F,     0x4000, *v, 2);
   GETVARINT_STEP(a, p, 14, 0x3FFF,   0x200000, *v, 3);
   GETVARINT_STEP(a, p, 21, 0x1FFFFF, 0x10000000, *v, 4);
   b = (a & 0x0FFFFFFF );
 
@@ -366,11 +369,11 @@
 */
 int sqlite3Fts3GetVarint32(const char *p, int *pi){
   u32 a;
 
 #ifndef fts3GetVarint32
-  GETVARINT_STEP(a, p, 0,  0x00,     0x80, *pi, 1);
+  GETVARINT_INIT(a, p, 0,  0x00,     0x80, *pi, 1);
 #else
   a = (*p++);
   assert( a & 0x80 );
 #endif
 

Index: src/fkey.c
==================================================================
--- src/fkey.c
+++ src/fkey.c
@@ -546,10 +546,11 @@
   Vdbe *v = sqlite3GetVdbe(pParse);
 
   assert( pIdx==0 || pIdx->pTable==pTab );
   assert( pIdx==0 || pIdx->nKeyCol==pFKey->nCol );
   assert( pIdx!=0 || pFKey->nCol==1 );
+  assert( pIdx!=0 || HasRowid(pTab) );
 
   if( nIncr<0 ){
     iFkIfZero = sqlite3VdbeAddOp2(v, OP_FkIfZero, pFKey->isDeferred, 0);
   }
 
@@ -598,10 +599,11 @@
       pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, -1);
       pNe = sqlite3PExpr(pParse, TK_NE, pLeft, pRight, 0);
     }else{
       Expr *pEq, *pAll = 0;
       Index *pPk = sqlite3PrimaryKeyIndex(pTab);
+      assert( pIdx!=0 );
       for(i=0; i<pPk->nKeyCol; i++){
         i16 iCol = pIdx->aiColumn[i];
         pLeft = exprTableRegister(pParse, pTab, regData, iCol);
         pRight = exprTableColumn(db, pTab, pSrc->a[0].iCursor, iCol);
         pEq = sqlite3PExpr(pParse, TK_EQ, pLeft, pRight, 0);