From: stephan <stephan@noemail.net>
Date: Thu, 23 Apr 2026 14:05:36 +0000 (+0000)
Subject: CLI shell: handle the special case of .prompt "" to not incorrectly report that as... 
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=2545d9c20161647f130488b43c1b5ebd526c0227;p=thirdparty%2Fsqlite.git

CLI shell: handle the special case of .prompt "" to not incorrectly report that as an OOM. Reported [https://fossil-scm.org/forum/forumpost/ca277be73a|in the Fossil SCM forum].

FossilOrigin-Name: 3fa0500b964869c45f7b49717680b791049f7cd8c47a06a337dd22351d2002f9
---

diff --git a/manifest b/manifest
index eed413f51a..67b132c44c 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C When\supdating\sindexes\son\sexpressions,\somit\sthe\supdate\sif\sthe\snew\sindexed\svalues\sare\sthe\ssame\sas\sthe\sold.
-D 2026-04-22T19:38:04.412
+C CLI\sshell:\shandle\sthe\sspecial\scase\sof\s.prompt\s""\sto\snot\sincorrectly\sreport\sthat\sas\san\sOOM.\sReported\s[https://fossil-scm.org/forum/forumpost/ca277be73a|in\sthe\sFossil\sSCM\sforum].
+D 2026-04-23T14:05:36.810
 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 928ff887f2a7c64275182060d94d06fdddbe32226c569781cf7e7edc6f58d7fd
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49
-F src/shell.c.in 68ce578f06cf2fcf6fa17867f9a35a139be1c39fd019be3ab1a7b9e6732e78ea
+F src/shell.c.in 20e359ac77d07e5dc636e526ef85da692384228e7997d7ec28568125a028a8f7
 F src/sqlite.h.in 39d2e09114d2bdb7afd998f4a469c8f8cd065f8093835a7d0422f260fc78fb4f
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -2203,9 +2203,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 5e1b5ff1c170e94956bf77bd38afcad6369cb9f9333864711212af045281ad0e 685be705a2a69e79de0d581e5bbe9d942133817342121786a551d95d59a4af6c
-R d93ff546001d5b8e63f19e558bfbb1fe
-T +closed 685be705a2a69e79de0d581e5bbe9d942133817342121786a551d95d59a4af6c
-U dan
-Z 875a2795405bb6857eccd218f82c65cb
+P f0fc4e5ec334da3a1db8b0334e23d1911874c96675690da94210b2afb45f7307
+R 8d234e3b9433af1e3f0a80c9a4b0d7e1
+U stephan
+Z 6630d18578075877abd9f98362e99ff8
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index eb67778018..16b30d8971 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-f0fc4e5ec334da3a1db8b0334e23d1911874c96675690da94210b2afb45f7307
+3fa0500b964869c45f7b49717680b791049f7cd8c47a06a337dd22351d2002f9
diff --git a/src/shell.c.in b/src/shell.c.in
index 16933cd2c0..6217223e22 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -1175,7 +1175,11 @@ static char *expand_prompt(
       }
     }
   }
-  
+
+  if( 0==sqlite3_str_length(pOut) ){
+    /* Avoid a bogus OOM */
+    sqlite3_str_appendchar(pOut, 1, '\0');
+  }
   return sqlite3_str_finish(pOut);
 }