diff --git a/manifest b/manifest index 4b5a02e20b..44f872d3c2 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Restore\s3.53.0\shandling\sof\scodepoints\su+fffe\sand\su+ffff\s(they\sare\sseparator\scharacters)\sin\sfts3\sand\sfts5.\sSee\sforum\spost\s[forum:/info/9c6ec90d24\s|\s2026-10-13T08:37:16Z]. -D 2026-10-13T15:51:29.756 +C Avoid\san\sassert()\sfailure\sby\sclearing\sVdbe.smimask\swhen\sVdbe.expmask\sis\scleared. +D 2026-10-13T17:08:19.986 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -873,7 +873,7 @@ F src/vdbe.c e8f89a20f1f4511cbe4bfd73e20017ae872cd2444b3c10e05b7d9676c120231a F src/vdbe.h b6ffb28da04363fd5d439b8204118fd3f2e751abe4f8e3edb089155fb90d4607 F src/vdbeInt.h 68e5ab63f184f2871780c83ce78b425d0360869611baea4c65575f91f76ac1d3 F src/vdbeapi.c 62dde4b2763b061b2cef7a2ebcfc7d54ada04471189011cb0c9315dcaea2fc86 -F src/vdbeaux.c 27d92528e7953a80f64782ef75e65a6694277214082e87d125e74e52d9e7ecd5 +F src/vdbeaux.c 7e3975222531284ff14cb1be93b5751f6a3392a56d86d6329fcaa120471f56f3 F src/vdbeblob.c b3f0640db9642fbdc88bd6ebcc83d6009514cafc98f062f675f2c8d505d82692 F src/vdbemem.c b2113c949e2ed918294e16a5ebaacdaca6be4f820f670517e3362e94c7019432 F src/vdbesort.c a72ad2a629df2901fde4aa588e38590d0aa27b7d5bc3b2a416e5f295de839cc1 @@ -2287,8 +2287,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P 2ca1a93f01b777276494cf2bd6f7aaa86deeb2d8a43dbcd5dccc3a31318482a3 -R 230e1971b5bc4fe3fcc60123fa4334e3 +P f5ed4850175263ef66fade0d54193dfa96935ae63e2516922b7aae816924726a +R 905c21b7e646c8e30dec32fbd16f2ebb U dan -Z 8104643a93889dac908024e003341241 +Z 9d837f4221a3dc1245c737fb8cd754f5 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 7acb2e7282..999984c7dc 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f5ed4850175263ef66fade0d54193dfa96935ae63e2516922b7aae816924726a +6399cc43b5927eaaef855fd0daab0cffc90c559266ca6ecc41ffcd5609007976 diff --git a/src/vdbeaux.c b/src/vdbeaux.c index f33684b14d..8b9b02dd2b 100644 --- a/src/vdbeaux.c +++ b/src/vdbeaux.c @@ -72,6 +72,7 @@ void sqlite3VdbeSetSql(Vdbe *p, const char *z, int n, u8 prepFlags){ p->prepFlags = prepFlags; if( (prepFlags & SQLITE_PREPARE_SAVESQL)==0 ){ p->expmask = 0; + p->smimask = 0; } assert( p->zSql==0 ); p->zSql = sqlite3DbStrNDup(p->db, z, n);