Invent a random name if the zName to xOpen is null

Author: Spxg

sqlite-wasm-rs/src/shim/vfs/memory.rs

@@ -1,12 +1,11 @@
 //! Memory VFS, used as the default VFS
 
-use std::{collections::HashMap, ffi::CStr, sync::Arc};
-
+use crate::shim::libsqlite3::*;
+use crate::shim::vfs::utils::get_random_name;
 use js_sys::{Date, Math};
 use once_cell::sync::Lazy;
-
-use crate::export::*;
 use parking_lot::{Mutex, MutexGuard, RwLock};
+use std::{collections::HashMap, ffi::CStr, sync::Arc};
 
 /// thread::sleep is available when atomics are enabled
 #[cfg(target_feature = "atomics")]
@@ -94,23 +93,28 @@ unsafe extern "C" fn xOpen(
     flags: ::std::os::raw::c_int,
     pOutFlags: *mut ::std::os::raw::c_int,
 ) -> ::std::os::raw::c_int {
-    let Ok(s) = CStr::from_ptr(zName).to_str() else {
-        return SQLITE_ERROR;
+    let name = if zName.is_null() {
+        get_random_name()
+    } else {
+        let Ok(s) = CStr::from_ptr(zName).to_str() else {
+            return SQLITE_ERROR;
+        };
+        s.into()
     };
 
     let mut name2file = name2file();
-    let mem_file = if let Some(mem_file) = name2file.get(s) {
+    let mem_file = if let Some(mem_file) = name2file.get(&name) {
         Arc::clone(mem_file)
     } else {
         if flags & SQLITE_OPEN_CREATE == 0 {
             return SQLITE_CANTOPEN;
         }
         let file = Arc::new(RwLock::new(MemFile {
-            name: s.into(),
+            name: name.clone(),
             flags,
             data: Vec::new(),
         }));
-        name2file.insert(s.into(), Arc::clone(&file));
+        name2file.insert(name, Arc::clone(&file));
         file
     };
 

sqlite-wasm-rs/src/shim/vfs/mod.rs

@@ -2,3 +2,4 @@
 
 pub mod memory;
 pub mod sahpool;
+pub mod utils;

sqlite-wasm-rs/src/shim/vfs/sahpool.rs

@@ -2,12 +2,10 @@
 //!
 //! <https://github.com/sqlite/sqlite/blob/master/ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js>
 
-use crate::export::*;
-
 use crate::fragile::FragileComfirmed;
-use js_sys::{
-    Array, DataView, IteratorNext, Map, Math, Number, Object, Reflect, Set, Uint32Array, Uint8Array,
-};
+use crate::shim::libsqlite3::*;
+use crate::shim::vfs::utils::get_random_name;
+use js_sys::{Array, DataView, IteratorNext, Map, Object, Reflect, Set, Uint32Array, Uint8Array};
 use once_cell::sync::Lazy;
 use parking_lot::{Mutex, RwLock};
 use std::ffi::CString;
@@ -70,11 +68,6 @@ fn compute_digest(_byte_array: &Uint8Array) -> Uint32Array {
     u32_array
 }
 
-fn get_random_name() -> String {
-    let random = Number::from(Math::random()).to_string(36).unwrap();
-    random.slice(2, random.length()).as_string().unwrap()
-}
-
 #[repr(C)]
 struct OpfsFile {
     io_methods: sqlite3_file,
@@ -841,7 +834,6 @@ unsafe extern "C" fn xFullPathname(
     if len > nOut as usize {
         return SQLITE_CANTOPEN;
     }
-
     zName.copy_to(zOut, len);
 
     SQLITE_OK
@@ -880,7 +872,11 @@ unsafe extern "C" fn xOpen(
     let pool = pool(pVfs);
 
     let f = || {
-        let name = pool.get_path(zName)?;
+        let name = if zName.is_null() {
+            get_random_name()
+        } else {
+            pool.get_path(zName)?
+        };
         let sah = match pool.get_sah_for_path(&name) {
             Some(sah) => sah,
             None => {

sqlite-wasm-rs/src/shim/vfs/utils.rs

@@ -0,0 +1,7 @@
+use js_sys::{Math, Number};
+
+/// get random name if zFileName is null and other cases
+pub fn get_random_name() -> String {
+    let random = Number::from(Math::random()).to_string(36).unwrap();
+    random.slice(2, random.length()).as_string().unwrap()
+}