From f5eb69d009a8dcef1f1f60af66d5ab8c61fc193d Mon Sep 17 00:00:00 2001
From: stephan <stephan@noemail.net>
Date: Sat, 30 Sep 2023 13:16:15 +0000
Subject: [PATCH] Correct an undefined-value deref in the JS bindings,
 triggered by passing invalid args and then tripping over an undefined value
 while trying to report that. Reported in [forum:dd42df144651d779|forum post
 dd42df144651d779].

FossilOrigin-Name: 1545f0f7359d00ed47fce6be029e0c4d87ec092cdf9e609f86e0e5b93412c8a4
---
 ext/wasm/api/sqlite3-api-glue.js |  6 +++---
 manifest                         | 16 ++++++++--------
 manifest.uuid                    |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ext/wasm/api/sqlite3-api-glue.js b/ext/wasm/api/sqlite3-api-glue.js
index 60050461c7..f23a02366b 100644
--- a/ext/wasm/api/sqlite3-api-glue.js
+++ b/ext/wasm/api/sqlite3-api-glue.js
@@ -888,9 +888,9 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      consistency with non-special-case wrappings.
   */
   const __dbArgcMismatch = (pDb,f,n)=>{
-    return sqlite3.util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
-                                              f+"() requires "+n+" argument"+
-                                              (1===n?"":'s')+".");
+    return util.sqlite3_wasm_db_error(pDb, capi.SQLITE_MISUSE,
+                                      f+"() requires "+n+" argument"+
+                                      (1===n?"":'s')+".");
   };
 
   /** Code duplication reducer for functions which take an encoding
diff --git a/manifest b/manifest
index 1f655abdd9..7d9f41d91d 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Do\snot\stry\sto\sconvert\sa\sdouble\sinto\san\sunsigned\s64-bit\sinteger,\sas\sthat\sdoes\nnot\swork\son\sall\splatforms.\s\sA\sdouble\scan\sonly\sbe\sconverted\sinto\sa\ssigned\n64-bit\sinteger.
-D 2023-09-15T10:27:34.742
+C Correct\san\sundefined-value\sderef\sin\sthe\sJS\sbindings,\striggered\sby\spassing\sinvalid\sargs\sand\sthen\stripping\sover\san\sundefined\svalue\swhile\strying\sto\sreport\sthat.\sReported\sin\s[forum:dd42df144651d779|forum\spost\sdd42df144651d779].
+D 2023-09-30T13:16:15.480
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -542,7 +542,7 @@ F ext/wasm/api/post-js-footer.js cd0a8ec768501d9bd45d325ab0442037fb0e33d1f3b4f08
 F ext/wasm/api/post-js-header.js 47b6b281f39ad59fa6e8b658308cd98ea292c286a68407b35ff3ed9cfd281a62
 F ext/wasm/api/pre-js.c-pp.js ad906703f7429590f2fbf5e6498513bf727a1a4f0ebfa057afb08161d7511219
 F ext/wasm/api/sqlite3-api-cleanup.js d235ad237df6954145404305040991c72ef8b1881715d2a650dda7b3c2576d0e
-F ext/wasm/api/sqlite3-api-glue.js b65e546568f1dfb35205b9792feb5146a6323d71b55cda58e2ed30def6dd52f3
+F ext/wasm/api/sqlite3-api-glue.js 26aedfb27915f4f316f6eac84078443e4f0d2dfe5f012310014923ed4b77b2b6
 F ext/wasm/api/sqlite3-api-oo1.js 9678dc4d9a5d39632b6ffe6ea94a023119260815bf32f265bf5f6c36c9516db8
 F ext/wasm/api/sqlite3-api-prologue.js 5f283b096b98bfb1ee2f2201e7ff0489dff00e29e1030c30953bdb4f5b87f4bd
 F ext/wasm/api/sqlite3-api-worker1.js 9f32af64df1a031071912eea7a201557fe39b1738645c0134562bb84e88e2fec
@@ -2092,9 +2092,9 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P dfc42411e6630325691176439e662c1cf46cbc6923b5c11836de1f43ecfe0b7d
-Q +ce339046416e9ddeffe77f71a8bfb8c5b302160c3207f919aebd62902618ed59
-R 8423898a78087355aed7423d77864cd2
-U drh
-Z 140128eb740947e0be66ebc08c64d8e8
+P 4ce5a03e7436fbe93baa746312014d8b04cde0787066989f60c2454a42e817d6
+Q +fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
+R 5ba85960404f371baa4c698789aca4b1
+U stephan
+Z 025125e09c330de5267e596b74e21e7f
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 0a230d7ef3..a6e397a0ed 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4ce5a03e7436fbe93baa746312014d8b04cde0787066989f60c2454a42e817d6
\ No newline at end of file
+1545f0f7359d00ed47fce6be029e0c4d87ec092cdf9e609f86e0e5b93412c8a4
\ No newline at end of file
-- 
2.47.2