Correct the result code from kvstorageRead() for the OOM case to be a negative value.

FossilOrigin-Name: cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 8e382e7f53cada53e20147653282681dd0a8d52a..e2f1576c6c04070ae941abe115274c0c85c6d7f9 100644 (file)
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -641,7 +641,7 @@ EM_JS(int, kvstorageRead,
   const stack = stackSave();
   try {
     const zXKey = kvstorageMakeKeyOnJSStack(zClass,zKey);
-    if(!zXKey) return 1/*OOM*/;
+    if(!zXKey) return -3/*OOM*/;
     const jKey = UTF8ToString(zXKey);
     const jV = ((115/*=='s'*/===getValue(zClass))
                 ? sessionStorage : localStorage).getItem(jKey);
@@ -661,7 +661,7 @@ EM_JS(int, kvstorageRead,
     return nBuf - 1;
   }catch(e){
     console.error("kvstorageRead()",e);
-    return -1;
+    return -2;
   }finally{
     stackRestore(stack);
   }

diff --git a/manifest b/manifest
index fc069fb45bb77b8421a8e9e9b10c2cb5512e4528..df15b889381cca34795c01e859d3e356936eecb4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Minor\scleanups\sand\sdocs\sfor\sthe\sEM_JS()\simpls\sof\sthe\skvvfs\sread/write/delete\sops.
-D 2022-09-11T05:38:39.331
+C Correct\sthe\sresult\scode\sfrom\skvstorageRead()\sfor\sthe\sOOM\scase\sto\sbe\sa\snegative\svalue.
+D 2022-09-11T05:44:15.092
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -488,7 +488,7 @@ F ext/wasm/api/sqlite3-api-opfs.js 011799db398157cbd254264b6ebae00d7234b93d0e9e8
 F ext/wasm/api/sqlite3-api-prologue.js 88e58145b0c71b00cd523b656016193d6ce8cf22c7ece8225838625f9187e6d1
 F ext/wasm/api/sqlite3-api-worker1.js 73579555563b789785ae83724014eaf31811073aad9be6596c8336ffb51edd71
 F ext/wasm/api/sqlite3-wasi.h 25356084cfe0d40458a902afb465df8c21fc4152c1d0a59b563a3fba59a068f9
-F ext/wasm/api/sqlite3-wasm.c ca61244ff11992d82f0abe30563f6a46b5bc5ba6ae6e3fe0de813a539d032638
+F ext/wasm/api/sqlite3-wasm.c 7fc3a86843e99e0dc09df8ef11fa8e5d17351ddb77ff2603e6282dd376f63e72
 F ext/wasm/batch-runner.html 23209ade7981acce7ecd79d6eff9f4c5a4e8b14ae867ac27cd89b230be640fa6
 F ext/wasm/batch-runner.js a727cbbffe63fd17fb5a590dc679f0b13bd51880e8f84b461d7df246417689e8
 F ext/wasm/common/SqliteTestUtil.js 529161a624265ba84271a52db58da022649832fa1c71309fb1e02cc037327a2b
@@ -2019,8 +2019,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 06610314fcf644f323c2f7ae11d7f4349b195e66d0ebbee590438dd99d97eb96
-R 57acbb8d05cac7106145ba92b2f60bd7
+P 53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
+R 8c8179df681ac6c18cab6f56d59f4476
 U stephan
-Z a67cf75775135685688642fe9cc532b8
+Z a75e401f8f11ec78560c63fda40a275f
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f196ec7f1b13580d7eea1bb3cdce587532045f34..964b66bfeeb7501fab687b4095f62918aae216cd 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-53b7572e441be4b4b29b4228d0f95b24457d7faaf6c0b568ed5c970a55e21ffb
\ No newline at end of file
+cdbf09fa1b0c93aeb3222a157de33a4688ae629c2b829ffff0f1f62364c5ae1c
\ No newline at end of file