From c1f4848a4633e0c7891cded10792d3a402cfdc19 Mon Sep 17 00:00:00 2001 From: drh <> Date: Fri, 7 Aug 2026 18:41:59 +0000 Subject: [PATCH] Fix a harmless UBSAN warning. FossilOrigin-Name: eb492208fceb9ea0e68ba0012806fe36f55f0b270af6f3704c51235bcae27869 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/vdbeInt.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index a25905704d..d11102c94e 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Change\sthe\sorder\sof\stwo\soperations\sin\sthe\sREAL\sdecoded\sin\sOP_Column\sfor\sa\nsmall\sperformance\sboost. -D 2026-08-07T18:18:31.607 +C Fix\sa\sharmless\sUBSAN\swarning. +D 2026-08-07T18:41:59.189 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -811,7 +811,7 @@ F src/util.c fcab5d997364c657e973e2bd3b9d2181aeb0926be0c028f20dfd4445894af3b4 F src/vacuum.c d3d35d8ae893d419ade5fa196d761a83bddcbb62137a1a157ae751ef38b26e82 F src/vdbe.c 5a2810a8e7b13a5855b046b967815988e510e39039877219914cbd09d55fa712 F src/vdbe.h 70e862ac8a11b590f8c1eaac17a0078429d42bc4ea3f757a9af0f451dd966a71 -F src/vdbeInt.h e52453a8f9150e573e9143504d2576457036fc99d53ed8074b49505afd17fdc6 +F src/vdbeInt.h ddf8f621a9a15d0672c0d86d84cbd1cfed1f3a9c90ac19b0b85381a79aad73ec F src/vdbeapi.c 6ad0c841b6cb87de068f71787f385149d794e8830176bf72d09a36b9f655ac5b F src/vdbeaux.c 00d784fb1713fdc95493266b2a2e7ff6638f6eb657b37b622bc71e074c875a7e F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692 @@ -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 20f50ea9c617307262b7b8a9b878e3fc0d18729452d7e1efd7c06625559d8afb -R 101a58e703d9e9d57afbcc09afcd233e +P d3ab3da0246df5cff298309c7d6ffbb18f1217e248bce819911db50e670eb093 +R 2bb0e870bacca059ac693cf1dd9b0cc1 U drh -Z 2166be58717cc72439696cc4e397483a +Z 4d9dea0ecd77d578e9f702900003ca6a # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 030dd36654..7fdb898026 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -d3ab3da0246df5cff298309c7d6ffbb18f1217e248bce819911db50e670eb093 +eb492208fceb9ea0e68ba0012806fe36f55f0b270af6f3704c51235bcae27869 diff --git a/src/vdbeInt.h b/src/vdbeInt.h index 1bf2329afb..5cf6744b6f 100644 --- a/src/vdbeInt.h +++ b/src/vdbeInt.h @@ -595,7 +595,7 @@ extern const u8 sqlite3SmallTypeSizes[]; #define THREE_BYTE_INT(x) (65536*(i8)((x)[0])|((x)[1]<<8)|(x)[2]) #define FOUR_BYTE_UINT(x) (((u32)(x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]) #define FOUR_BYTE_U64(x) (((u64)(x)[0]<<24)|((x)[1]<<16)|((x)[2]<<8)|(x)[3]) -#define FOUR_BYTE_INT(x) (16777216*((x)[0])|((x)[1]<<16)|((x)[2]<<8)|(x)[3]) +#define FOUR_BYTE_INT(x) ((int)FOUR_BYTE_UINT(x)) #define SIX_BYTE_INT(x) (FOUR_BYTE_UINT(x+2)+4294967296LL*TWO_BYTE_INT(x)) #define EIGHT_BYTE_U64(x) (FOUR_BYTE_U64(x+4)+(FOUR_BYTE_U64(x)<<32))