From 0f5a3f16f30dba4945339ec85a70da641d7977c8 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 9 Oct 2025 14:01:52 +0000 Subject: [PATCH] In the CLI, limit column widths specified by the ".width" command to have an absolute value not more than 30,000. FossilOrigin-Name: b3741f1101d25eded57a62b4967ec1bcce532dc9937c4b7b74cb689861efb442 --- manifest | 15 +++++++-------- manifest.uuid | 2 +- src/shell.c.in | 5 ++++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/manifest b/manifest index f8ddab917c..51244c99e7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Move\sthe\scarray()\sextension\sand\sthe\spercentile\sextension\sinto\sthe\namalgamation.\s\sBoth\sare\sstill\sturned\soff\sby\sdefault\sand\smust\sbe\nenable\susing\sSQLITE_ENABLE_CARRAY\sand\sSQLITE_ENABLE_PERCENTILE\scompile-time\noptions,\sso\sthere\sis\sno\sincrease\sin\sobject\scode\ssize.\s\sHowever,\sthese\nextensions\sare\snow\smore\seasily\savailable. -D 2025-10-08T19:01:00.726 +C In\sthe\sCLI,\slimit\scolumn\swidths\sspecified\sby\sthe\s".width"\scommand\sto\nhave\san\sabsolute\svalue\snot\smore\sthan\s30,000. +D 2025-10-09T14:01:52.855 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -679,7 +679,7 @@ F src/btree.h e823c46d87f63d904d735a24b76146d19f51f04445ea561f71cc3382fd1307f0 F src/btreeInt.h 9c0f9ea5c9b5f4dcaea18111d43efe95f2ac276cd86d770dce10fd99ccc93886 F src/build.c 611e07299d72ff04bbcb9e7109183467e30925d203c3e121ef9bb3cf6876289b F src/callback.c acae8c8dddda41ee85cfdf19b926eefe830f371069f8aadca3aa39adf5b1c859 -F src/carray.c 9d489582fcb0f3a78e32baf48474a9c0e9603171f4929e7be5feddb0e281b8d3 w ext/misc/carray.c +F src/carray.c 9d489582fcb0f3a78e32baf48474a9c0e9603171f4929e7be5feddb0e281b8d3 F src/complete.c a3634ab1e687055cd002e11b8f43eb75c17da23e F src/date.c e19e0cfff9a41bfdd884c655755f6f00bca4c1a22272b56e0dd6667b7ea893a2 F src/dbpage.c 081c59d84f187aa0eb48d98faf9578a00bde360f68438d646a86b618653d2479 @@ -735,7 +735,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c F src/resolve.c f8d1d011aba0964ff1bdccd049d4d2c2fec217efd90d202a4bb775e926b2c25d F src/rowset.c 8432130e6c344b3401a8874c3cb49fefe6873fec593294de077afea2dce5ec97 F src/select.c b95181711d59c36d9789e67f76c4cfec64b99f9629a50be5e6566e117b87d957 -F src/shell.c.in 03c988b6b089628fd0333fb517cf579453e464851941757cf249371332a5edbc +F src/shell.c.in 01e4a3ee9de00d423c8da51f2b0395b002707671f0fb8ab8e43e7c80718fa853 F src/sqlite.h.in 5706a425081d1712be81b31456801919c5760087cf3de32bbf86885994db26fe F src/sqlite3.rc 015537e6ac1eec6c7050e17b616c2ffe6f70fca241835a84a4f0d5937383c479 F src/sqlite3ext.h 3f0c4ed6934e7309a61c6f3c30f70a30a5b869f785bb3d9f721a36c5e4359126 @@ -2169,9 +2169,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P 8bf337e6e609dd38de6002f2d3d3ebf52dd0462ed98a50e4b002a7c6860d30c5 e11e9913e56d42d2baa07f1b549f212b873fe7343a06825682d843471c4a3640 -R 3a53b839014ceb3d5c2e0c7c02022d2f -T +closed e11e9913e56d42d2baa07f1b549f212b873fe7343a06825682d843471c4a3640 +P 2d40dc2173ac394024ae267419bd8d3621f15d4cd2449c9c2f7310acc3b190f0 +R eee9d1c206b49ec3ae26a46c172e3b61 U drh -Z e02bc94aaec0bec3492d453a50d86796 +Z 04b05decf94b84100216295e717c7c17 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 0e8bde333a..380326b0c2 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -2d40dc2173ac394024ae267419bd8d3621f15d4cd2449c9c2f7310acc3b190f0 +b3741f1101d25eded57a62b4967ec1bcce532dc9937c4b7b74cb689861efb442 diff --git a/src/shell.c.in b/src/shell.c.in index df80872853..3ce69a18db 100644 --- a/src/shell.c.in +++ b/src/shell.c.in @@ -12347,7 +12347,10 @@ static int do_meta_command(char *zLine, ShellState *p){ if( p->colWidth==0 && p->nWidth>0 ) shell_out_of_memory(); if( p->nWidth ) p->actualWidth = &p->colWidth[p->nWidth]; for(j=1; jcolWidth[j-1] = (int)integerValue(azArg[j]); + i64 w = integerValue(azArg[j]); + if( w < -30000 ) w = -30000; + if( w > +30000 ) w = +30000; + p->colWidth[j-1] = (int)w; } }else