From d98f758f405a03617fde1fe9f5cd5c2d41d820b7 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 27 Nov 2025 11:40:40 +0000 Subject: [PATCH] Fix an utterly harmless memory leak that occurs when the CLI exits due to an error in the command-line arguments. FossilOrigin-Name: 55942e6d582d421187f2806dc93ea931b64dbb4025203540af654f56d1c9bc36 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/shell.c.in | 3 ++- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/manifest b/manifest index e8aea6af26..c963f393c8 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Ensure\sthat\sthe\ssplit-column\stransformer\sin\sQRF\scorrectly\ntransforms\sthe\sabNum[]\sarray. -D 2025-11-27T11:29:14.492 +C Fix\san\sutterly\sharmless\smemory\sleak\sthat\soccurs\swhen\sthe\sCLI\sexits\sdue\nto\san\serror\sin\sthe\scommand-line\sarguments. +D 2025-11-27T11:40:40.248 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 6a509cddd815d64f6141e539fff633a518a393772a44dffb4490f7fc3f0d83a9 -F src/shell.c.in d139d8f1fe138235be68da9183fea6d2bceac642e2c3432ddebd7b8a100a46c8 +F src/shell.c.in 2f1e67595ec37adc4d7deec3d488df2185c586b657b2c20fa8677946c13da25b F src/sqlite.h.in f1363321ca55cc2feaa289e9fe6dfb08102a28c54edf005564711a2348b06eef F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998 @@ -2180,8 +2180,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 cf45d534d63878b00d949234e81cf9c67db7d7067bbac2fd5cd1780463fcce06 -R f218e4b551adf7251e42fcbdc0f4ddeb +P ea67d8b001d1be3b0410ca697ff7ddda71c957c8ecb6d76e75133ba39b754623 +R e6930b1477d8434e534555fe5d129aec U drh -Z 49054ea308cf65a4fcce75e77038ee99 +Z eabcaa8d22309d26b221a4479d689a4c # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 911b0a80b0..3f11b5ee59 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -ea67d8b001d1be3b0410ca697ff7ddda71c957c8ecb6d76e75133ba39b754623 +55942e6d582d421187f2806dc93ea931b64dbb4025203540af654f56d1c9bc36 diff --git a/src/shell.c.in b/src/shell.c.in index c1012a7d76..cf81cfb6e0 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -13015,7 +13015,8 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){ }else{ cli_printf(stderr,"%s: Error: unknown option: %s\n", Argv0, z); eputz("Use -help for a list of options.\n"); - return 1; + rc = 1; + goto shell_main_exit; } } -- 2.47.3