Fix CLI fault on missing -nonce reported by [forum:/info/f8c14a1134|forum post f8c14a...

FossilOrigin-Name: 67cf7c40961f6d181577783e1c656abb56c4848d087794b6fc98f4d42aba48ea

diff --git a/manifest b/manifest
index 1f373f05782415e0c5e40fb0b379133f73d29623..cfccbe6efc3c66b43592c0885ca6150f75848c50 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\sproblem\scausing\san\sinfinite\sloop\sin\sthe\srecovery\sextension\swhen\sprocessing\sa\scorrupt\sfree-block\slist.
-D 2023-06-12T13:46:26.212
+C Fix\sCLI\sfault\son\smissing\s-nonce\sreported\sby\s[forum:/info/f8c14a1134|forum\spost\sf8c14a1134].
+D 2023-06-12T13:53:48.275
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -637,7 +637,7 @@ F src/random.c 606b00941a1d7dd09c381d3279a058d771f406c5213c9932bbd93d5587be4b9c
 F src/resolve.c 3e53e02ce87c9582bd7e7d22f13f4094a271678d9dc72820fa257a2abb5e4032
 F src/rowset.c ba9515a922af32abe1f7d39406b9d35730ed65efab9443dc5702693b60854c92
 F src/select.c acb558bb719fc141532ece116fecefeb896e5f4986ed70fbbe1acda4294a4c5f
-F src/shell.c.in 2c8cc2a0b01daf00767b53bb073324e2a0ce50df6c01dc751389403100b9ef1d
+F src/shell.c.in 7122df3f18a35fd9e1ce9be7e00cd0ea3ec925756d41552403715b34a75ed88a
 F src/sqlite.h.in c14a4471fcd897a03631ac7ad3d05505e895e7b6419ec5b96cae9bc4df7a9fc6
 F src/sqlite3.rc 5121c9e10c3964d5755191c80dd1180c122fc3a8
 F src/sqlite3ext.h da473ce2b3d0ae407a6300c4a164589b9a6bfdbec9462688a8593ff16f3bb6e4
@@ -2070,9 +2070,10 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 50721074f70d19128c9ae048a6d9f7608f8c54c42e6b3ae45dfd0939448233bf
-Q +5a516c6c7a25cec4d0a0cca530017a3299f7a332319f3e1f7cf12f53c32b88ca
-R 7040f5952cd9e55afa402c670545d5d4
+P d21c06b73dc4e472950fb27e589e951601b642501b0200fd14685174d90d8f7b
+Q +a1823b297616bc2bd64eda9df4850fb460d8da8959ae3728195db896d1f89e7b
+Q +cd24178bbaad4a1dafc3848e7d74240f90030160b5c43c93e1e0e11b073c2df5
+R b03640622be5f113ee1e877c4e0f6a1d
 U drh
-Z 0b15bcf987a397d5defa5fc4a066e35d
+Z d355f7b4ba646d13ea353680aef16d38
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index e08812661d38a1c5e4070f2184c5ec547cc494a8..4774b7d844cc7c6a81d7c06f7aaf71d595ec5fda 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-d21c06b73dc4e472950fb27e589e951601b642501b0200fd14685174d90d8f7b
\ No newline at end of file
+67cf7c40961f6d181577783e1c656abb56c4848d087794b6fc98f4d42aba48ea
\ No newline at end of file

diff --git a/src/shell.c.in b/src/shell.c.in
index 575cbde4c5ccc3a54d57a61b1a35e33c7660ebe6..bf0c93eabe01451b38249c165fe5d55c266aaa55 100644 (file)
--- a/src/shell.c.in
+++ b/src/shell.c.in
@@ -12220,7 +12220,7 @@ int SQLITE_CDECL wmain(int argc, wchar_t **wargv){
       bail_on_error = 1;
     }else if( cli_strcmp(z,"-nonce")==0 ){
       free(data.zNonce);
-      data.zNonce = strdup(argv[++i]);
+      data.zNonce = strdup(cmdline_option_value(argc, argv, ++i));
     }else if( cli_strcmp(z,"-unsafe-testing")==0 ){
       ShellSetFlag(&data,SHFLG_TestingMode);
     }else if( cli_strcmp(z,"-safe")==0 ){