From: stephan <stephan@noemail.net>
Date: Sat, 30 Sep 2023 13:13:23 +0000 (+0000)
Subject: Correct an undefined-value deref in the JS bindings, triggered by passing invalid... 
X-Git-Tag: version-3.44.0~169
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8f43696c8a480890a69d4e7101f148980cf7b606;p=thirdparty%2Fsqlite.git

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: fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
---

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 3d321b7ac8..bcd71766f1 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Make\s(almost)\sall\sSQLite3Jni.sqlite3_...\smembers\spublic\sbut\smake\sthe\sSQLite3Jni\sclass\spackage-private,\swhich\shas\sthe\ssame\sfoot-protection\seffect\sbut\smakes\sit\smuch\ssimpler\sto\spatch\sSQLite3Jni\sto\spublicize\sthe\sinterface\slater.\sRemove\ssome\sof\sthe\sextraneous\sfoot-shooting\sprotection\sfrom\sindidivual\sfunctions,\sin\slieu\smoving\sit\sto\sthe\sstill-pending\shigher-level\sinterfaces.
-D 2023-09-30T10:59:18.528
+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:13:23.491
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -568,7 +568,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 9aeba7b45cf41b3a26d34d7fb2525633cd1adfc544888c1ea8dbb077496f4ce9
 F ext/wasm/api/sqlite3-api-worker1.js 9f32af64df1a031071912eea7a201557fe39b1738645c0134562bb84e88e2fec
@@ -2122,8 +2122,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 7927c42410ba0d5fc8e6e08caaa5cbaaeb359869f17d1afaa082f1aa47fdb2fc
-R 41c93716d5742c840487d8cf14f1b112
+P 082b86683e77b2d4a30e1515552f52511324ef97c43b622b4dab7975ae9fbd7d
+R 591f9b73cca09b508c0b6ebf21ba6baf
 U stephan
-Z f8b592e48715b4c5a1763a2edafcc919
+Z 721fe9bcdd26f7d908e2f3afe9b3a510
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index e28489a3bf..971b7b9223 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-082b86683e77b2d4a30e1515552f52511324ef97c43b622b4dab7975ae9fbd7d
\ No newline at end of file
+fd4632540717c4771ac9ae1fe4400091a2cd0553639bf809abaf4ecbc54de4f0
\ No newline at end of file