1 files changed, 4 insertions, 0 deletions
diff --git a/src/vdbe.c b/src/vdbe.c
index e4cbeb656..78c5511e5 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4408,6 +4408,10 @@ case OP_Rowid: {                 /* out2-prerelease */
     assert( pC->pCursor!=0 );
     rc = sqlite3VdbeCursorRestore(pC);
     if( rc ) goto abort_due_to_error;
+    if( pC->nullRow ){
+      pOut->flags = MEM_Null;
+      break;
+    }
     rc = sqlite3BtreeKeySize(pC->pCursor, &v);
     assert( rc==SQLITE_OK );  /* Always so because of CursorRestore() above */
   }