From: drh <> Date: Fri, 26 Jun 2026 14:36:05 +0000 (+0000) Subject: Fix parsing of unterminated "[" tokens in the incremental integrity X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9954751509c41a4428d6376c07f66d78bfcfbec4;p=thirdparty%2Fsqlite.git Fix parsing of unterminated "[" tokens in the incremental integrity check extension. [bugs:/info/2026-06-26T10:05:53Z|Bug 2026-06-26T10:05:53Z]. FossilOrigin-Name: c8f143bd618fe59c18eb92c8f5ae1b153f03cf05e1c457910f6a46599f719809 --- diff --git a/ext/intck/sqlite3intck.c b/ext/intck/sqlite3intck.c index e3fef77637..6e2b5543a7 100644 --- a/ext/intck/sqlite3intck.c +++ b/ext/intck/sqlite3intck.c @@ -328,7 +328,7 @@ static int intckGetToken(const char *z){ } } else if( c=='[' ){ - while( z[iRet++]!=']' && z[iRet] ); + while( z[iRet] && z[iRet++]!=']' ){} } else if( (c>='A' && c<='Z') || (c>='a' && c<='z') ){ while( (z[iRet]>='A' && z[iRet]<='Z') || (z[iRet]>='a' && z[iRet]<='z') ){ diff --git a/manifest b/manifest index 1391a2f1cf..5436bea8ef 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\s32-bit\sinteger\soverflow\sin\sthe\szipfile\sextension\sgiven\nridiculous\sarguments.\n[bugs:/info/2026-06-26T11:40:02Z|Bug\s2026-06-26T11:40:02Z] -D 2026-06-26T14:20:32.346 +C Fix\sparsing\sof\sunterminated\s"["\stokens\sin\sthe\sincremental\sintegrity\ncheck\sextension.\n[bugs:/info/2026-06-26T10:05:53Z|Bug\s2026-06-26T10:05:53Z]. +D 2026-06-26T14:36:05.739 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -289,7 +289,7 @@ F ext/intck/intck_common.tcl a61fd2697ae55b0a3d89847ca0b590c6e0d8ff64bebb70920d9 F ext/intck/intckbusy.test d5ed4ef85a4b1dc1dee2484bd14a4bb68529659cca743327df0c775f005fa387 F ext/intck/intckcorrupt.test f6c302792326fb3db9dcfc70b554c55369bc4b52882eaaf039cfe0b74c821029 F ext/intck/intckfault.test cff3f75dff74abb3edfcb13f6aa53f6436746ab64b09fe5e2028f051e985efab -F ext/intck/sqlite3intck.c 3c4a166645a1624731f63acd342e24e81e4ffd497116d94a427d72e6cc6caa69 +F ext/intck/sqlite3intck.c 134e65f5999f1b6a0d82f146f68488cd1bc47391861b497c598bed5198578924 F ext/intck/sqlite3intck.h 2b40c38e7063ab822c974c0bd4aed97dabb579ccfe2e180a4639bb3bbef0f1c9 F ext/intck/test_intck.c 4f9eaadaedccb9df1d26ba41116a0a8e5b0c5556dc3098c8ff68633adcccdea8 F ext/jni/GNUmakefile 8a94e3a1953b88cf117fb2a5380480feada8b4f5316f02572cab425030a720b4 @@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 062597f10a6d3f8c959a38e4ab6ee1a885499dd7018662e3e6268b2ee6c63c1b -R 9cb86ae56ed03a37997aa50e89f34eb7 +P 7eedf458ca4e8e72d309d5d342d364f49950fedca94dc157337e65d766c012c1 +R 86ea478314cfee06e1eab5628d781439 U drh -Z 54a28adbfdf1f80ddd514b9c44bf4c4d +Z 4d7e132ebcee1709934af3f18f18d6e7 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 812e3717aa..546a28abda 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -7eedf458ca4e8e72d309d5d342d364f49950fedca94dc157337e65d766c012c1 +c8f143bd618fe59c18eb92c8f5ae1b153f03cf05e1c457910f6a46599f719809