From: stephan <stephan@noemail.net>
Date: Tue, 26 May 2026 17:15:54 +0000 (+0000)
Subject: Fix an OOM check in shell.c.in. Addresses [forum:2026-05-26T15:02:35Z|forum post... 
X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=b79ffe60b642cafac939e384c87120a48bf35661;p=thirdparty%2Fsqlite.git

Fix an OOM check in shell.c.in. Addresses [forum:2026-05-26T15:02:35Z|forum post 2026-05-26T15:02:35Z].

FossilOrigin-Name: e78198e6aec57c28e33a5b1c5ae9943115a35d2fbfa04c8428318567f17eefbe
---

diff --git a/manifest b/manifest
index 4046a4a9fd..302763d986 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\spotential\s1-byte\soverread\sin\ssqlite3changeset_invert()\swhen\sprocessing\sa\scorrupt\sbuffer.
-D 2026-05-26T15:03:30.608
+C Fix\san\sOOM\scheck\sin\sshell.c.in.\sAddresses\s[forum:2026-05-26T15:02:35Z|forum\spost\s2026-05-26T15:02:35Z].
+D 2026-05-26T17:15:54.982
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -739,7 +739,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 7e936a09405cb59e2b3e51a3ad23753e4803afc5269c5171a54c9bdd70f4fc50
 F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97
 F src/select.c 4c05cde130f26991b7411d8c6809e0630625e18078742c963a047b4b9cc01d49
-F src/shell.c.in 64b10c18b7a3d155bd840cdf57697166c2a2e10b842e2a7e127a72fd00e911c6
+F src/shell.c.in 691fac6a7f6f6fc72836aa2779d81b8cf67c896a15699c65e810cd1e8c6270f4
 F src/sqlite.h.in 749454ec71c875bc130d399ff9a7e47191d143d1b9d8b4af3839b6028df9eda9
 F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479
 F src/sqlite3ext.h 9788c301f95370fa30e808861f1d2e6f022a816ddbe2a4f67486784c1b31db2e
@@ -2208,8 +2208,8 @@ F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee
 F tool/warnings.sh a554d13f6e5cf3760f041b87939e3d616ec6961859c3245e8ef701d1eafc2ca2
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
 F tool/winmain.c 00c8fb88e365c9017db14c73d3c78af62194d9644feaf60e220ab0f411f3604c
-P 8a289158e2baeee8aa5e601bde46b0482361064ede09e4108f519270efdd5f69
-R 53d114c56fd88f483ff58176d8dd3508
-U dan
-Z 53bc7922e1df89bfed65694000950c2c
+P 78eaa605cb6c14e5bd49a898b4c737957bd60c8714913cc2341f4ffe3bfe81fe
+R 0ea5d9e8131e03388e63afd6b28977de
+U stephan
+Z 42c9e13ccb4a757e025a153555bbaa63
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index badf97ab35..b570bd8db8 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-78eaa605cb6c14e5bd49a898b4c737957bd60c8714913cc2341f4ffe3bfe81fe
+e78198e6aec57c28e33a5b1c5ae9943115a35d2fbfa04c8428318567f17eefbe
diff --git a/src/shell.c.in b/src/shell.c.in
index 2dd2ca8156..01b3f93679 100644
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -13440,7 +13440,7 @@ static void verify_uninitialized(void){
 /*
 ** https://sqlite.org/forum/forumpost/aad7a634916ff050:
 **
-** Calling setlocale(LC_ALL,"") is required to get libedit to accept
+** Calling setlocale(LC_...,"") is required to get libedit to accept
 ** non-ASCII input.
 */
 #define DO_SET_LOCALE 1
@@ -13717,7 +13717,7 @@ int SQLITE_CDECL main(int argc, char **argv){
         azCmd = realloc(azCmd, sizeof(azCmd[0])*nCmd);
         shell_check_oom(azCmd);
         aiCmd = realloc(aiCmd, sizeof(aiCmd[0])*nCmd);
-        shell_check_oom(azCmd);
+        shell_check_oom(aiCmd);
         azCmd[nCmd-1] = z;
         aiCmd[nCmd-1] = i;
       }