From: drh <> Date: Wed, 8 Jul 2026 20:30:22 +0000 (+0000) Subject: Fix an incorrect free() call in the CLI on Windows when using the -A X-Git-Url: http://git.ipfire.org/index.cgi?a=commitdiff_plain;h=1103b10d8a0459df403275140cd30df415395145;p=thirdparty%2Fsqlite.git Fix an incorrect free() call in the CLI on Windows when using the -A command-line option. FossilOrigin-Name: 1ce57ba94b63796d5c9b913e3973751ee4f146bdc452ce8b408d2c0cff7f598d --- diff --git a/manifest b/manifest index 6e5c5b3f9b..7cab178edc 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Allow\s"ALTER\sTABLE\s...\sDROP\sCONSTRAINT"\sto\sdrop\sforeign\skey\sconstraints. -D 2026-07-08T17:54:16.137 +C Fix\san\sincorrect\sfree()\scall\sin\sthe\sCLI\son\sWindows\swhen\susing\sthe\s-A\ncommand-line\soption. +D 2026-07-08T20:30:22.822 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -743,7 +743,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 54395ee97eb710e695202d4112cf2b1c1c7767a57afcea745df71abb1c917768 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c f553420eaf5c72a49cef786621eea79dd8c4411671839fb05250bb49ca74a0a0 -F src/shell.c.in 5b94be0ff5a385cd42beed62ca229a062e5a696c2afd6567ce699b0d6d8bd21b +F src/shell.c.in fc4ef494ecb839c78189e5951e066791b7b88113f5d36177b21e30b04c33eae7 F src/sqlite.h.in d9ec41feb4cd804e68b174328b43beb3f1f71bba13e1c7a439efb826d301cccc F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 0efd4723bad9124ea1f581d9f1ea0254ac1c6f3e5fb29e4f3dcf36c72485a456 @@ -2214,9 +2214,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c -P c8aa208bf5b00f3ab93c5edd510dfd0d7edd271c064f159616ee409b308f7eb9 17c08963812d6458783720c511806727aeae263a243a11d49b463d2c7867cd54 -R 4bd3a46fbadb8b3a12b89cadb35de70a -T +closed 17c08963812d6458783720c511806727aeae263a243a11d49b463d2c7867cd54 -U dan -Z 69eaea413d4dc845591c3ed44775077d +P 4b0882cdb5b7947b23023c13e33f532ca44c0645f6a142a3c7bdb143142d9078 +R 0bc11de58955184ca587db86d1aa7d6a +U drh +Z 15160dbce8a9c98179c72005df7b14ae # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 1dacf7c52e..ec5509f931 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4b0882cdb5b7947b23023c13e33f532ca44c0645f6a142a3c7bdb143142d9078 +1ce57ba94b63796d5c9b913e3973751ee4f146bdc452ce8b408d2c0cff7f598d diff --git a/src/shell.c.in b/src/shell.c.in index a30c82b810..8922364fe3 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -14316,8 +14316,10 @@ int SQLITE_CDECL main(int argc, char **argv){ } open_db(&data, OPEN_DB_ZIPFILE); if( z[2] ){ + char *zSaved = argv[i]; argv[i] = &z[2]; arDotCommand(&data, 1, argv+(i-1), argc-(i-1)); + argv[i] = zSaved; }else{ arDotCommand(&data, 1, argv+i, argc-i); }