The BLOB returned by sqlite3VdbeMemFromBtree() does not need to be

zero-terminated.

FossilOrigin-Name: e0af9a9040768adf8bba42a8780adeb6304bc442afb1f35d239d019db1624f40

diff --git a/manifest b/manifest
index cdc5d8be7a9b3903e95d0f8c57b1457ad5429b23..9419550ac9a3ee62f21770657906fad673a3a1c7 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Small\ssize\sand\sperformance\soptimization\sin\sthe\sbytecode\sengine.
-D 2017-09-20T17:49:12.127
+C The\sBLOB\sreturned\sby\ssqlite3VdbeMemFromBtree()\sdoes\snot\sneed\sto\sbe\nzero-terminated.
+D 2017-09-20T18:07:50.056
 F Makefile.in 4bc36d913c2e3e2d326d588d72f618ac9788b2fd4b7efda61102611a6495c3ff
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 6033b51b6aea702ea059f6ab2d47b1d3cef648695f787247dd4fb395fe60673f
@@ -532,7 +532,7 @@ F src/vdbeInt.h 1fe00770144c12c4913128f35262d11527ef3284561baaab59b947a41c08d0d9
 F src/vdbeapi.c 9c670ca0dcc1cd86373aa353b747b26fe531ca5cd4331690c611d1f03842e2a1
 F src/vdbeaux.c 3be977a032e54fe46cb1b1f3ba62158438b0cc93e091f6feca7742d20dad3203
 F src/vdbeblob.c 635a79b60340a6a14a622ea8dcb081f0a66b1ac3836870c587f232eec08c0286
-F src/vdbemem.c 0180295206f98131d904a900a7887d072eecd1388258bf0e7c2bcd20eabb679e
+F src/vdbemem.c 4996dd14244a7757a9b8b085c03825e4b7611865e73e55df248b4f0836dcf9bf
 F src/vdbesort.c 731a09e5cb9e96b70c394c1b7cf3860fbe84acca7682e178615eb941a3a0ef2f
 F src/vdbetrace.c 48e11ebe040c6b41d146abed2602e3d00d621d7ebe4eb29b0a0f1617fd3c2f6c
 F src/vtab.c f1d5c23132fb0247af3e86146404112283ddedb6c518de0d4edc91cfb36970ef
@@ -1655,7 +1655,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7f2bd4ff45fba29528c18cac6da983bd9b164303525d3965056f5b40f85dc83f
-R 5b0871d836c521035772bd26987bd6b8
+P 3b3e32d4cd07a1d2d1708fffa47819345ae6b39205a9f548280d499c8f481d64
+R bc412d1d9fd3e512c9d7b13d3be8fe98
 U drh
-Z 4278521e76ab29461c223833181d9fb1
+Z 372454472847a80abeaf6ba3b240911a

diff --git a/manifest.uuid b/manifest.uuid
index e7cb2fbd979662a878574e2fe6630c5ce3e907fe..05e0da2a72c4cdf488cbfcb803596f6f73028c03 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3b3e32d4cd07a1d2d1708fffa47819345ae6b39205a9f548280d499c8f481d64
\ No newline at end of file
+e0af9a9040768adf8bba42a8780adeb6304bc442afb1f35d239d019db1624f40
\ No newline at end of file

diff --git a/src/vdbemem.c b/src/vdbemem.c
index 11caecbba64d7ebbff41bc2cb89fa3b5f6abfe14..4437de556a632e912e23b435c99e18bfafadde1c 100644 (file)
--- a/src/vdbemem.c
+++ b/src/vdbemem.c
@@ -1012,12 +1012,10 @@ static SQLITE_NOINLINE int vdbeMemFromBtreeResize(
 ){
   int rc;
   pMem->flags = MEM_Null;
-  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt+2)) ){
+  if( SQLITE_OK==(rc = sqlite3VdbeMemClearAndResize(pMem, amt)) ){
     rc = sqlite3BtreePayload(pCur, offset, amt, pMem->z);
     if( rc==SQLITE_OK ){
-      pMem->z[amt] = 0;
-      pMem->z[amt+1] = 0;
-      pMem->flags = MEM_Blob|MEM_Term;
+      pMem->flags = MEM_Blob;
       pMem->n = (int)amt;
     }else{
       sqlite3VdbeMemRelease(pMem);