From: dan Date: Tue, 29 Sep 2015 12:19:51 +0000 (+0000) Subject: Fix an off-by-one error in test function fts5_decode(). X-Git-Tag: version-3.9.0~51 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4ad09719194533b38a16766d4c4562e0707f7934;p=thirdparty%2Fsqlite.git Fix an off-by-one error in test function fts5_decode(). FossilOrigin-Name: 3a9f076250d9559d8ea94ba44095ba3ddbc5542d --- diff --git a/ext/fts5/fts5_index.c b/ext/fts5/fts5_index.c index b8aa52c2f8..9910c59b0a 100644 --- a/ext/fts5/fts5_index.c +++ b/ext/fts5/fts5_index.c @@ -5361,7 +5361,7 @@ static void fts5DecodeFunction( memset(&term, 0, sizeof(Fts5Buffer)); if( n<4 ){ - sqlite3Fts5BufferSet(&rc, &s, 8, (const u8*)"corrupt"); + sqlite3Fts5BufferSet(&rc, &s, 7, (const u8*)"corrupt"); goto decode_out; }else{ iRowidOff = fts5GetU16(&a[0]); diff --git a/manifest b/manifest index 6bcfc15a78..ae2961c2dc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Extra\sinformation\sprovided\sby\s.wheretrace\son\sinput\sflags\sto\sthe\squery\splanner\nand\son\sthe\sresult\sof\ssqlite3WhereOkOnePass(). -D 2015-09-28T17:05:22.174 +C Fix\san\soff-by-one\serror\sin\stest\sfunction\sfts5_decode(). +D 2015-09-29T12:19:51.430 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f F Makefile.in 2143eeef6d0cc26006ae5fc4bb242a4a8b973412 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23 @@ -112,7 +112,7 @@ F ext/fts5/fts5_buffer.c 64dcaf36a3ebda9e84b7c3b8788887ec325e12a4 F ext/fts5/fts5_config.c 57ee5fe71578cb494574fc0e6e51acb9a22a8695 F ext/fts5/fts5_expr.c 667faaf14a69a5683ac383acdc8d942cf32c3f93 F ext/fts5/fts5_hash.c 4bf4b99708848357b8a2b5819e509eb6d3df9246 -F ext/fts5/fts5_index.c 4fdbc0a321e3a1d73741a623d7aea4db78d6a86d +F ext/fts5/fts5_index.c c77882ab38d698d5147cef96fa67a2121d77c0b3 F ext/fts5/fts5_main.c 53116cffeb26898832ff7700cc5ebac5fe085d32 F ext/fts5/fts5_storage.c 120f7b143688b5b7710dacbd48cff211609b8059 F ext/fts5/fts5_tcl.c 6da58d6e8f42a93c4486b5ba9b187a7f995dee37 @@ -1388,7 +1388,7 @@ F tool/vdbe_profile.tcl 67746953071a9f8f2f668b73fe899074e2c6d8c1 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4 F tool/warnings.sh 48bd54594752d5be3337f12c72f28d2080cb630b F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 5c14d447055bb337428eb1fe0a2934abee381829 -R afaa284829583439d3c828667e0babfd -U drh -Z 4d08d7f777c595957317ee86b8c88bc8 +P c5566bb39c8d9b58f77380b81a873429575c7d5c +R 8c1c5df148af89b61b9ed44613e1cccf +U dan +Z c6128292281c17956918fd20bfe641c1 diff --git a/manifest.uuid b/manifest.uuid index 544e794a7a..7b46927912 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -c5566bb39c8d9b58f77380b81a873429575c7d5c \ No newline at end of file +3a9f076250d9559d8ea94ba44095ba3ddbc5542d \ No newline at end of file