Avoid calling sqlite3BtreeKeysize() on a b-tree cursor in SKIPNEXT or SKIPPREV state.

FossilOrigin-Name: 2f2ecb994889acb783616acb7307f8fed962d213

diff --git a/manifest b/manifest
index d851cc2e874127389dea6b8eb1038799de3b9e29..55c07fe2407e7fd7448dd7dc105938f2e484dc42 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Improved\scomments\son\sthe\sBtCursor.skipNext\sfield.\s\sNo\schanges\sto\scode.
-D 2014-11-17T19:25:15.092
+C Avoid\scalling\ssqlite3BtreeKeysize()\son\sa\sb-tree\scursor\sin\sSKIPNEXT\sor\sSKIPPREV\sstate.
+D 2014-11-17T19:44:44.917
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in cf57f673d77606ab0f2d9627ca52a9ba1464146a
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -289,7 +289,7 @@ F src/update.c 3c4ecc282accf12d39edb8d524cf089645e55a13
 F src/utf.c fc6b889ba0779b7722634cdeaa25f1930d93820c
 F src/util.c 4006c01772bd8d8ac4306d523bbcee41d3e392d8
 F src/vacuum.c 59f03f92bcff57faa6a8ca256eb29ccddfb0614a
-F src/vdbe.c 3e8f9787d9a5fe24077f7af0baa2d11042471f12
+F src/vdbe.c 8bc291aa00646d07dab33047520960ea454c5a2f
 F src/vdbe.h 09f5b4e3719fa454f252322b1cdab5cf1f361327
 F src/vdbeInt.h e2a060a55ee18a6ab973353a5e2ec7ee569bf787
 F src/vdbeapi.c 37a6c6ae284a97bcace365f2f0a225680c0499d9
@@ -1205,7 +1205,8 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh 0abfd78ceb09b7f7c27c688c8e3fe93268a13b32
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 34fc4a082c192830e48f643549c04a4f91912b8b
-R b667da582f38b5593e8a936d8e9b63b7
-U drh
-Z 1e479ba79d4cbfb8037d6ba7f0cc99ff
+P e956e7db057d1112badf5e0671cea95201385b44
+Q +54e7d3fcb1ab21c03ffef1af93ae029a2901098a
+R b1492d8f4cbcc74596556f240b662de2
+U dan
+Z 45bbf8c9451b95c29c15305e9bbd4586

diff --git a/manifest.uuid b/manifest.uuid
index a049e1fe86c46e6f163c5efd521400f6286c0105..bec82c6bb3da49b311f9afdc96ad5a3ee44cc6c7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e956e7db057d1112badf5e0671cea95201385b44
\ No newline at end of file
+2f2ecb994889acb783616acb7307f8fed962d213
\ No newline at end of file

diff --git a/src/vdbe.c b/src/vdbe.c
index 9a8db1a638665bb35add114ef9055e09f589253e..366c7a01661b2d48e986d903d412981e69df33f5 100644 (file)
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -4405,6 +4405,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 */
   }