From 1b087395d7c567584d373660e84e4d1a3cfd6f08 Mon Sep 17 00:00:00 2001 From: drh <> Date: Sun, 2 Aug 2026 22:51:45 +0000 Subject: [PATCH] Fix harmless compiler warnings caused by the enhancement at [a67bff640c9e4ffd] FossilOrigin-Name: e0ab12ec7270046010c0b96682799d5659c10e6ba9620bb4bffc8209ad1272fe --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vdbe.c | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/manifest b/manifest index 5de5132731..b114a01948 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Make\sthe\stest-use-only\sSQL\sfunction\sfts3_exprtest()\s(available\sonly\sif\ncompiled\swith\sSQLITE_TEST)\smore\sresistant\sto\sout-of-bounds\sinputs.\n[bugs:/info/2026-08-02T12:28:28Z|Bug\s2026-08-02T12:28:28Z]\sand\n[bugs:/info/2026-08-02T12:31:40Z|bug\s2026-08-02T12:31:40Z]. -D 2026-08-02T22:45:36.376 +C Fix\sharmless\scompiler\swarnings\scaused\sby\sthe\senhancement\sat\s[a67bff640c9e4ffd] +D 2026-08-02T22:51:45.540 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -809,7 +809,7 @@ F src/upsert.c dd9f0fcccbfb4f20e1026a21a7254ba3f2c08e9cfa92affaff5b5ec3b00ea549 F src/utf.c 7267c3fb9e2467020507601af3354c2446c61f444387e094c779dccd5ca62165 F src/util.c fcab5d997364c657e973e2bd3b9d2181aeb0926be0c028f20dfd4445894af3b4 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82 -F src/vdbe.c d8cea3e6b55b9de00b3ae08ae6e3db84269567f98de86a47d30001639dacedf5 +F src/vdbe.c 0649187bbbe1990e7d32f4737d59cacf554de34b30a3121279830f3e0d3859ff F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71 F src/vdbeInt.h c31ba4dc8d280c2b1dc89c6fcee68f2555e3813ab34279552c20b964c0e338b1 F src/vdbeapi.c 6ad0c841b6cb87de068f71787f385149d794e8830176bf72d09a36b9f655ac5b @@ -2218,8 +2218,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 092b87164aa7d097287ad0fee4be8b66cf840043dc3091193824d74f2d54a833 -R 56d59c39f731282b997e0f77b0d7e095 +P 30a61347077f4b9996f6ea771c7fd27203ab05039d54cc4df3068e45faf4d2d4 +R 25dd28ae21aebefc99feb91a0acf1a98 U drh -Z 1c2bbdd6cd4e685211f038a0db162a0f +Z a41fc7385f0f6c8eda2aca85b6f4689a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index d9911f32e7..2c09ff3a4b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -30a61347077f4b9996f6ea771c7fd27203ab05039d54cc4df3068e45faf4d2d4 +e0ab12ec7270046010c0b96682799d5659c10e6ba9620bb4bffc8209ad1272fe diff --git a/src/vdbe.c b/src/vdbe.c index 75fe54bcda..4139bd7b03 100644 --- a/src/vdbe.c +++ b/src/vdbe.c @@ -707,7 +707,7 @@ static u64 filterHash(const Mem *aMem, const Op *pOp){ }else if( p->flags & MEM_Str ){ u64 x; h += p->n; - if( p->n >= sizeof(x) ){ + if( p->n >= (int)sizeof(x) ){ memcpy(&x, p->z, sizeof(x)); h += x; memcpy(&x, p->z + p->n - sizeof(x), sizeof(x)); @@ -721,7 +721,7 @@ static u64 filterHash(const Mem *aMem, const Op *pOp){ int n = p->n; u64 x = 0; if( n ){ - memcpy(&x, p->z, MIN(n, sizeof(x))); + memcpy(&x, p->z, MIN(n, (int)sizeof(x))); h += x; } h += n; -- 2.47.3