Factor out an obsolete malloc failure check and an snprintf() for keys in transient...

FossilOrigin-Name: e2e94f9094f8bbe93cdf7d2a2e72e92462b94e18319603c5a364f183cb780be1

diff --git a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
index 4fba3a15160facdd9e1d0f374ccec65e6e7fbc87..82b960f87026f6b636b21cd18e80ad53bd7bec18 100644 (file)
--- a/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
+++ b/ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js
@@ -416,16 +416,16 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
      its management).
   */
   const fileForDb = function(pDb){
-    const stack = pstack.pointer;
+    const stack = wasm.pstack.pointer;
     try{
-      const pOut = pstack.allocPtr();
+      const pOut = wasm.pstack.allocPtr();
       return wasm.exports.sqlite3_file_control(
         pDb, wasm.ptr.null, capi.SQLITE_FCNTL_FILE_POINTER, pOut
       )
         ? null
         : new KVVfsFile(wasm.peekPtr(pOut));
     }finally{
-      pstack.restore(stack);
+      wasm.pstack.restore(stack);
     }
   };
 
@@ -449,18 +449,22 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
   };
 //#endif nope
 
-  /** Returns a C string from sqlite3__wasm_kvvfsMakeKey(). The memory
-      is static, so must be copied before a second call. */
+  const kvvfsMakeKey = wasm.exports.sqlite3__wasm_kvvfsMakeKey;
+  /**
+     Returns a C string from sqlite3__wasm_kvvfsMakeKey() OR returns
+     zKey. In the former case the memory is static, so must be copied
+     before a second call. zKey MUST be a pointer passed to a
+     VFS/file method, to allow us to avoid an alloc and/or an
+     snprintf(). It requires C-string arguments for zClass and
+     zKey. zClass may be NULL but zKey may not.
+  */
   const zKeyForStorage = (store, zClass, zKey)=>{
     //debug("zKeyForStorage(",store, wasm.cstrToJs(zClass), wasm.cstrToJs(zKey));
-    return wasm.exports.sqlite3__wasm_kvvfsMakeKey(
-      store.keyPrefix ? zClass : wasm.ptr.null, zKey
-    );
+    return (zClass && store.keyPrefix) ? kvvfsMakeKey(zClass, zKey) : zKey;
   };
-  /* We use this for the many small key allocations we need.
-     TODO: prealloc a buffer on demand for this. We know its
-     max size from kvvfsMethods.$nKeySize. */
-  const pstack = wasm.pstack;
+
+  const jsKeyForStorage = (store,zClass,zKey)=>
+        wasm.cstrToJs(zKeyForStorage(store, zClass, zKey));
 
   /**
      sqlite3_file pointers => objects, each of which has:
@@ -531,9 +535,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                   zBuf, nBuf, store );
           }
           if( !store ) return -1;
-          const zXKey = zKeyForStorage(store, zClass, zKey);
-          //if(!zXKey) return -3/*OOM*/;
-          const jXKey = wasm.cstrToJs(zXKey);
+          const jXKey = jsKeyForStorage(store, zClass, zKey);
           //debug("xRcrdRead zXKey", jzClass, wasm.cstrToJs(zXKey), store );
           const jV = store.storage.getItem(jXKey);
           if(null===jV) return -1;
@@ -541,7 +543,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
                                ** ASCII so that jV.length is equal
                                ** to the C-string's byte length. */;
           if( 0 ){
-            debug("xRcrdRead", wasm.cstrToJs(zXKey), store, jV);
+            debug("xRcrdRead", jXKey, store, jV);
           }
           if(nBuf<=0) return nV;
           else if(1===nBuf){
@@ -589,9 +591,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
         try {
           const jzClass = wasm.cstrToJs(zClass);
           const store = storageForZClass(jzClass);
-          const zXKey = zKeyForStorage(store, zClass, zKey);
-          //if(!zXKey) return SQLITE_NOMEM;
-          const jxKey = wasm.cstrToJs(zXKey);
+          const jxKey = jsKeyForStorage(store, zClass, zKey);
           const jData = wasm.cstrToJs(zData);
           store.storage.setItem(jxKey, jData);
           notifyListeners('write', store, jxKey, jData);
@@ -605,9 +605,7 @@ globalThis.sqlite3ApiBootstrap.initializers.push(function(sqlite3){
       xRcrdDelete: (zClass, zKey)=>{
         try {
           const store = storageForZClass(zClass);
-          const zXKey = zKeyForStorage(store, zClass, zKey);
-          //if(!zXKey) return capi.SQLITE_NOMEM;
-          const jxKey = wasm.cstrToJs(zXKey);
+          const jxKey = jsKeyForStorage(store, zClass, zKey);
           store.storage.removeItem(jxKey);
           notifyListeners('delete', store, jxKey);
           return 0;

diff --git a/ext/wasm/api/sqlite3-wasm.c b/ext/wasm/api/sqlite3-wasm.c
index 95bcf4431a3d0b760956cadc57649ff947026433..a1d7cb07e1de4cde41e2e63947c17dc3e140e9c7 100644 (file)
--- a/ext/wasm/api/sqlite3-wasm.c
+++ b/ext/wasm/api/sqlite3-wasm.c
@@ -239,6 +239,11 @@
 // See also:
 //__attribute__((export_name("theExportedName"), used, visibility("default")))
 
+#if 0
+/** Increase the kvvfs key size limit from 32. */
+#define KVRECORD_KEY_SZ 64
+#endif
+
 /*
 ** Which sqlite3.c we're using needs to be configurable to enable
 ** building against a custom copy, e.g. the SEE variant. We #include
@@ -1590,16 +1595,31 @@ int sqlite3__wasm_posix_create_file( const char *zFilename,
 ** This function is NOT part of the sqlite3 public API. It is strictly
 ** for use by the sqlite project's own JS/WASM bindings.
 **
-** This returns a pointer to a static buffer, so it must be copied
-** if it needs to be retained across two calls to this function.
+** This returns either a pointer to a static buffer or zKeyIn directly
+** (if zClass is NULL or empty).
 */
 SQLITE_WASM_EXPORT
 const char * sqlite3__wasm_kvvfsMakeKey(const char *zClass,
                                         const char *zKeyIn){
   static char buf[SQLITE_KVOS_SZ+1] = {0};
   assert(sqlite3KvvfsMethods.nKeySize>24);
-  kvrecordMakeKey(zClass, zKeyIn, buf);
-  return buf;
+  if( zClass && *zClass ){
+    kvrecordMakeKey(zClass, zKeyIn, buf);
+    return buf;
+  }else{
+#if 1
+    /* We can return zKeyIn here only because the JS API takes special
+    ** care with its lifetime.*/
+    return zKeyIn;
+#else
+    /* It would be nice to be able to return zKeyIn directly here, but
+    ** it may have been allocated as part of the automated JS-to-WASM
+    ** conversions, in which case it will be freed before reaching the
+    ** caller. */
+    sqlite3_snprintf(KVRECORD_KEY_SZ, buf, "%s", zKeyIn);
+    return buf;
+#endif
+  }
 }
 
 /*

diff --git a/manifest b/manifest
index d1898acfaa05eab28bda5e218787dc4fa53ca1f1..b381aef70ac646ee721746b668700f082746e447 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Remove\sa\sJS-specific\sblock\sfrom\sos_kv.c.
-D 2025-11-26T17:17:22.760
+C Factor\sout\san\sobsolete\smalloc\sfailure\scheck\sand\san\ssnprintf()\sfor\skeys\sin\stransient\skvvfs\sstorage.
+D 2025-11-26T17:19:44.822
 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
@@ -600,11 +600,11 @@ F ext/wasm/api/sqlite3-api-worker1.c-pp.js 1041dd645e8e821c082b628cd8d9acf70c667
 F ext/wasm/api/sqlite3-license-version-header.js 0c807a421f0187e778dc1078f10d2994b915123c1223fe752b60afdcd1263f89
 F ext/wasm/api/sqlite3-opfs-async-proxy.js 9654b565b346dc609b75d15337f20acfa7af7d9d558da1afeb9b6d8eaa404966
 F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d
-F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 5b0719367e0613f9b6bf3a449312dbe06234938ce566e7b1806cd44e8bbdee1f
+F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js ba339fcc1ea253cdfd8c5f03567d3e2bf6a71c178ad6bbc6b0d60aaa6062216c
 F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js a2eea6442556867b589e04107796c6e1d04a472219529eeb45b7cd221d7d048b
 F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js 88ce2078267a2d1af57525a32d896295f4a8db7664de0e17e82dc9ff006ed8d3
 F ext/wasm/api/sqlite3-vtab-helper.c-pp.js 9097074724172e31e56ce20ccd7482259cf72a76124213cbc9469d757676da86
-F ext/wasm/api/sqlite3-wasm.c e5d2a31743b93a8c9e3ab6f63c5d0542666d20054fab36d65c95b3a3f4b734ca
+F ext/wasm/api/sqlite3-wasm.c 1d6f8f3486f4f9a21db597f84a015fe9bb7c111652ce6beacdaceb0d162617ff
 F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bda1c75bd674a92a0e27cc2f3d46dbbf21e422413f8046814515a0bd7409328a
 F ext/wasm/api/sqlite3-worker1.c-pp.js 802d69ead8c38dc1be52c83afbfc77e757da8a91a2e159e7ed3ecda8b8dba2e7
 F ext/wasm/c-pp-lite.c 943be1a36774d58385dca32de36fc18d4f432fe79f7aa35e6c85dd6a6b825bd0
@@ -2178,8 +2178,8 @@ F tool/version-info.c 33d0390ef484b3b1cb685d59362be891ea162123cea181cb8e6d2cf6dd
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh d924598cf2f55a4ecbc2aeb055c10bd5f48114793e7ba25f9585435da29e7e98
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P 430d4d668fc2d151f20a02ddbbac7f884258af7fd1268d3aafb5f9e8eadf844b
-R 97d64486b4b391325b5b64691589e23c
+P 3c1d5eac270e8afe6196ccb11a6d7bb0d1f262c882ce390a16b998bd2f55cb3d
+R 559ee0d478a7f3b78449f87dd9293df4
 U stephan
-Z 4b42bb50f91a3a3adbedb072d470ff51
+Z 94ea3fa5373b51001d96c5da81f5054a
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index d601e2405ae6d12d592e5fdf4570f472b314eba0..34e45c997247e58f9117593b7ae5fc2806f1bf90 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-3c1d5eac270e8afe6196ccb11a6d7bb0d1f262c882ce390a16b998bd2f55cb3d
+e2e94f9094f8bbe93cdf7d2a2e72e92462b94e18319603c5a364f183cb780be1