From: drh <> Date: Fri, 26 Jun 2026 14:47:07 +0000 (+0000) Subject: Fix parsing of unterminated "[" tokens in the incremental integrity X-Git-Tag: release~3 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a9fc90f932ee7b4443fa51bfe52a7d98d3f76795;p=thirdparty%2Fsqlite.git Fix parsing of unterminated "[" tokens in the incremental integrity check extension. FossilOrigin-Name: 6a55dc85b73ef98f0ef31d7b0740bfe46ebb25653f2dff4eb34074d1b455925a --- 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 ec76f75597..91ad213f64 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Avoid\s32-bit\sinteger\soverflow\sin\sthe\szipfile\sextension\sgiven\nridiculous\sarguments. -D 2026-06-26T14:22:53.880 +C Fix\sparsing\sof\sunterminated\s"["\stokens\sin\sthe\sincremental\sintegrity\ncheck\sextension. +D 2026-06-26T14:47:07.965 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -287,7 +287,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 @@ -2200,9 +2200,9 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P f73adcfc87803f373b7c55ec280e3bcae4b9f3a1f3edc2ee21bf12c696a46be4 -Q +7eedf458ca4e8e72d309d5d342d364f49950fedca94dc157337e65d766c012c1 -R a18040391bf5349618ca996d7ca8eee4 +P 2e1fdfbcc91da03795d6bb27980a329dc710d5c4c8540aa6e77413e29210be0e +Q +c8f143bd618fe59c18eb92c8f5ae1b153f03cf05e1c457910f6a46599f719809 +R 55ee39a0376dc0de97edb8f07e031e29 U drh -Z c5ec59d07c6105621e77a38c8a905ac0 +Z ec66a52fdc9f4aca5ce55c2954bd05d6 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index adf5ee1ac7..a1ac5d05ad 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2e1fdfbcc91da03795d6bb27980a329dc710d5c4c8540aa6e77413e29210be0e +6a55dc85b73ef98f0ef31d7b0740bfe46ebb25653f2dff4eb34074d1b455925a