From: stephan Date: Thu, 24 Oct 2024 15:58:37 +0000 (+0000) Subject: Add missing ZERO_ARGUMENT_GENERATE_SERIES checks to ext/misc/series.c, as reported... X-Git-Tag: major-relase~352 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7796ee07c42a3d290f2758fd2efb215c948ab698;p=thirdparty%2Fsqlite.git Add missing ZERO_ARGUMENT_GENERATE_SERIES checks to ext/misc/series.c, as reported via support mail. FossilOrigin-Name: 5a8e3915eec06dbec7e32d1b87c6a6d5eb618d9d1d9bac13f6e1e7f22bbf8180 --- diff --git a/ext/misc/series.c b/ext/misc/series.c index faf8fd0306..64f3be2c05 100644 --- a/ext/misc/series.c +++ b/ext/misc/series.c @@ -667,7 +667,9 @@ static int seriesBestIndex( idxNum &= ~0x3300; aIdx[5] = i; aIdx[6] = -1; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_GE: { @@ -675,7 +677,9 @@ static int seriesBestIndex( idxNum |= 0x0100; idxNum &= ~0x0200; aIdx[5] = i; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_GT: { @@ -683,7 +687,9 @@ static int seriesBestIndex( idxNum |= 0x0200; idxNum &= ~0x0100; aIdx[5] = i; +#ifndef ZERO_ARGUMENT_GENERATE_SERIES bStartSeen = 1; +#endif break; } case SQLITE_INDEX_CONSTRAINT_LE: { diff --git a/manifest b/manifest index afd64d8173..f3a52e3c6d 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\san\sinconsistency\sin\sthe\sway\sSQLITE_CORE\sis\sused\sin\sfts3.c. -D 2024-10-24T12:06:04.953 +C Add\smissing\sZERO_ARGUMENT_GENERATE_SERIES\schecks\sto\sext/misc/series.c,\sas\sreported\svia\ssupport\smail. +D 2024-10-24T15:58:37.345 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -424,7 +424,7 @@ F ext/misc/regexp.c 4bdd0045912f81c84908bd535ec5ad3b1c8540b4287c70ab840709636240 F ext/misc/remember.c add730f0f7e7436cd15ea3fd6a90fd83c3f706ab44169f7f048438b7d6baa69c F ext/misc/rot13.c 51ac5f51e9d5fd811db58a9c23c628ad5f333c173f1fc53c8491a3603d38556c F ext/misc/scrub.c 2a44b0d44c69584c0580ad2553f6290a307a49df4668941d2812135bfb96a946 -F ext/misc/series.c 596afbfbbc81ccf4ea6da11f016f7eed630ed195b5e9d548117e19f06d63f641 +F ext/misc/series.c ea604a16f9c5f7e09ccff3f18d94f2c3a6fa24ca08856156823d981873b8143c F ext/misc/sha1.c cb5002148c2661b5946f34561701e9105e9d339b713ec8ac057fd888b196dcb9 F ext/misc/shathree.c 1821d90a0040c9accdbe3e3527d378d30569475d758aa70f6848924c0b430e8c F ext/misc/showauth.c 732578f0fe4ce42d577e1c86dc89dd14a006ab52 @@ -2219,8 +2219,9 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P da9124fee28c155c4d1cc0d3949eb7b588a7236c12883a010af7909ad8e534ef -R 2c588882a830faac9ec2abff1f03e469 -U dan -Z 74338cb9c56cdad446f65085f6db6d70 +P d4816e534a22250bd18509b07edca205c7ad6a8b3ecbbf5336a517ac19f78f55 +Q +cd82e4c0f5f8ff16468b909d84dd5545c0456f624db61a4d112467a7cafed2fc +R e4ca7fa81f6860fc5a04c1e28cee3a2a +U stephan +Z f070b9e19001ab8c0e2d4fe251a41b20 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7b931e2bdc..37dc626886 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d4816e534a22250bd18509b07edca205c7ad6a8b3ecbbf5336a517ac19f78f55 +5a8e3915eec06dbec7e32d1b87c6a6d5eb618d9d1d9bac13f6e1e7f22bbf8180