From 15c6d88381ca9db5b519d251d9ea73d68009f96e Mon Sep 17 00:00:00 2001 From: drh <> Date: Mon, 3 Nov 2025 10:14:20 +0000 Subject: [PATCH] Fix a harmless memory leak in the CLI caused by the --cmd option generating an error message. FossilOrigin-Name: ab916bad188b150321e420ec0009d909c287e3790b5d6ec683e2df9ed457ff15 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index fa4b667451..1f96de9762 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Add\spedantic\sOOM\sdetection\slogic\sto\ssome\sdisused\sdiagnostic\sand\stest\scode.\nNo\schanges\sto\sany\sdeliverables. -D 2025-11-02T22:57:26.993 +C Fix\sa\sharmless\smemory\sleak\sin\sthe\sCLI\scaused\sby\sthe\s--cmd\soption\sgenerating\nan\serror\smessage. +D 2025-11-03T10:14:20.526 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -736,7 +736,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c 5616fbcf3b833c7c705b24371828215ad0925d0c0073216c4f153348d5753f0a F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c ba9cd07ffa3277883c1986085f6ddc4320f4d35d5f212ab58df79a7ecc1a576a -F src/shell.c.in e06c0e6b20cc8618e080496939155fc0a4728c9d9246923bfce9e52ad322575f +F src/shell.c.in 265015aaec4580a0bef50ff570ec8d2813498ee49dcfdf9757e76f3b2a59fc97 F src/sqlite.h.in f7944026ee89ea348f89aec56372d6d25b6cafc1d89df741278d6917e86326a3 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 7f236ca1b175ffe03316d974ef57df79b3938466c28d2f95caef5e08c57f3a52 @@ -2171,8 +2171,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P ce25a758d4cea1741cb3db6384720f17faef61b352d494ab410a83a41f1721d3 -R 2800055e6677b1a1b1ea5135c68cec66 +P abb6945fc62a1855786bda1f473edef0e937a791c453387a0859a6ce0451635a +R 6eccac974831219691324fee124f3e26 U drh -Z 2d5afc89f81af7d4e3e7bee3ca7202ac +Z 1ca3518379e930de296f5daf155cb13d # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bc6eb320b6..c86ab8b266 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -abb6945fc62a1855786bda1f473edef0e937a791c453387a0859a6ce0451635a +ab916bad188b150321e420ec0009d909c287e3790b5d6ec683e2df9ed457ff15 diff --git a/src/shell.c.in b/src/shell.c.in index c3f2a839d8..bd44a32510 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -13794,6 +13794,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ rc = shell_exec(&data, z, &zErrMsg); if( zErrMsg!=0 ){ shellEmitError(zErrMsg); + sqlite3_free(zErrMsg); if( bail_on_error ) return rc!=0 ? rc : 1; }else if( rc!=0 ){ sqlite3_fprintf(stderr,"Error: unable to process SQL \"%s\"\n", z); -- 2.47.3