From: drh <>
Date: Fri, 14 Nov 2025 21:49:27 +0000 (+0000)
Subject: Make use of the new sqlite3_str_free() interface in the CLI.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=850da77de16ec5f9d2f37b4d68002924a7998b89;p=thirdparty%2Fsqlite.git

Make use of the new sqlite3_str_free() interface in the CLI.

FossilOrigin-Name: 2e07bc29ab1ca66049337f2cfbefcd57bdcd691a381b309fb8a5db6e72e56d03
---

diff --git a/manifest b/manifest
index d9a60c985b..68225d7398 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Enforce\sthe\s--charlimit\sconstraint\sin\sQRF.
-D 2025-11-14T21:40:20.521
+C Make\suse\sof\sthe\snew\ssqlite3_str_free()\sinterface\sin\sthe\sCLI.
+D 2025-11-14T21:49:27.250
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -735,7 +735,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 036a035b7338d2b2a487ed8bc5704fe328730ff0e69fd2ad7eddac433ccb0fd1
+F src/shell.c.in 8304a5deebc291c52b7c6c9ced5014760a813133ac587fe7a8e3e826fb2cb477
 F src/sqlite.h.in 795ce84cc136b4e74d882cf4fab56d2927c20b9af9fd2fcea27760a6fe50851b
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 5d5330f5f8461f5ce74960436ddcfa53ecd09c2b8b23901e22ae38aec3243998
@@ -2175,8 +2175,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 9ee892b4f97c91208a658f09add00a567406e913edb022a2fd53333ea01c2b26
-R c9bf369ad8043e13ab5084e935fe2413
+P c25f8fdedd8d68e3551a445e24e1c60e105e18f9cf8f1badcbb77a58974f3381
+R 6709cc240d8387680d8df0a08649ae6f
 U drh
-Z c41407f8027f6af7e7c850d0c7018e85
+Z 635ab109ed8a23b9e3c629d94c6b696e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 093be235bf..6df7b61b65 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-c25f8fdedd8d68e3551a445e24e1c60e105e18f9cf8f1badcbb77a58974f3381
+2e07bc29ab1ca66049337f2cfbefcd57bdcd691a381b309fb8a5db6e72e56d03
diff --git a/src/shell.c.in b/src/shell.c.in
index 7941c53fd8..0258d4f1ee 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -2308,7 +2308,7 @@ static void shellFormatSchema(
          || sqlite3_strlike("CREATE UNIQUE INDEX%", zSql, 0)==0;
   z = sqlite3_mprintf("%s", zSql);
   if( z==0 ){
-    sqlite3_free(sqlite3_str_finish(pOut));
+    sqlite3_str_free(pOut);
     sqlite3_result_error_nomem(pCtx);
     return;
   }
@@ -5254,7 +5254,7 @@ static void output_reset(ShellState *p){
   p->out = stdout;
   setCrlfMode(p);
   if( cli_output_capture ){
-    sqlite3_free(sqlite3_str_finish(cli_output_capture));
+    sqlite3_str_free(cli_output_capture);
     cli_output_capture = 0;
   }
 }
@@ -8031,7 +8031,7 @@ static int dotCmdOutput(ShellState *p){
     /* no-op */
   }else if( cli_strcmp(zFile,"memory")==0 ){
     if( cli_output_capture ){
-      sqlite3_free(sqlite3_str_finish(cli_output_capture));
+      sqlite3_str_free(cli_output_capture);
     }
     cli_output_capture = sqlite3_str_new(0);
   }else if( zFile[0]=='|' ){
@@ -10066,7 +10066,7 @@ static int do_meta_command(const char *zLine, ShellState *p){
     }else{
       rc = shell_exec(&data, sqlite3_str_value(pSql), &zErrMsg);
     }
-    sqlite3_free(sqlite3_str_finish(pSql));
+    sqlite3_str_free(pSql);
 
     if( zErrMsg ){
       shellEmitError(zErrMsg);