From: drh <drh@noemail.net>
Date: Thu, 7 Apr 2016 14:16:16 +0000 (+0000)
Subject: Avoid decrementing a pointer off the front end of the buffer in OP_MakeRecord.
X-Git-Tag: version-3.13.0~119
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=45c3c663856a7e7aeea935ee3fd4509acf598cd1;p=thirdparty%2Fsqlite.git

Avoid decrementing a pointer off the front end of the buffer in OP_MakeRecord.

FossilOrigin-Name: 153135bfb3b8f7c407ccf36571e2d4d5afe28ea3
---

diff --git a/manifest b/manifest
index d866e27c78..54bbc7ace8 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Instead\sof\sjust\scommenting\sout\sthe\sunneeded\scode\sin\sthe\sprevious\scheck-in,\nremove\sit\scompletely.
-D 2016-04-07T14:05:20.785
+C Avoid\sdecrementing\sa\spointer\soff\sthe\sfront\send\sof\sthe\sbuffer\sin\sOP_MakeRecord.
+D 2016-04-07T14:16:16.723
 F Makefile.in eba680121821b8a60940a81454316f47a341487a
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 1f123a0757f6f04f0341accb46457e116817159a
@@ -441,7 +441,7 @@ F src/update.c 3e67ab3c0814635f355fb1f8ab010a2b9e016e7d
 F src/utf.c 699001c79f28e48e9bcdf8a463da029ea660540c
 F src/util.c 19509465217b673b38d5804a72778908b138953f
 F src/vacuum.c feb1eabb20987983d9350cad98299b21fa811f52
-F src/vdbe.c 936166d3dc5aa00364877603f545707896c1519e
+F src/vdbe.c e16e8625829858b2bf343c3cdd72bb43eab7d643
 F src/vdbe.h c16ba943d407baa1c7085eefea73a063fc631863
 F src/vdbeInt.h ddb157974436d87652de7dc641f7191496d9a8cd
 F src/vdbeapi.c ba85b78fe08dc4a9ce747e62c89a2b4a4547e74c
@@ -1482,7 +1482,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 e84e88e31b67afe42e2494d984ab1cafd107465a
-R 498c228ba25f81bda5f3077b10bd4000
+P 8415d4848ab36ca33b23d1fad6b063544de04a3b
+R 03453ebf1870335c86f4514ee1d5c7ac
 U drh
-Z 41c10e3b5fbbcc81e08050bb9e8f982f
+Z 0a2d3c19f1c3d2a6467caf636e91907c
diff --git a/manifest.uuid b/manifest.uuid
index 85f661be96..b3cd228a8b 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8415d4848ab36ca33b23d1fad6b063544de04a3b
\ No newline at end of file
+153135bfb3b8f7c407ccf36571e2d4d5afe28ea3
\ No newline at end of file
diff --git a/src/vdbe.c b/src/vdbe.c
index f5b00d824a..593ea40806 100644
--- a/src/vdbe.c
+++ b/src/vdbe.c
@@ -2755,7 +2755,9 @@ case OP_MakeRecord: {
     testcase( serial_type==127 );
     testcase( serial_type==128 );
     nHdr += serial_type<=127 ? 1 : sqlite3VarintLen(serial_type);
-  }while( (--pRec)>=pData0 );
+    if( pRec==pData0 ) break;
+    pRec--;
+  }while(1);
 
   /* EVIDENCE-OF: R-22564-11647 The header begins with a single varint
   ** which determines the total number of bytes in the header. The varint