From: stephan Date: Sat, 22 Nov 2025 17:27:16 +0000 (+0000) Subject: Fix a misinteraction of CREATE/READONLY flags in the OPFS VFS. X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=05478c714905c5c9910e103b177a950be48c8882;p=thirdparty%2Fsqlite.git Fix a misinteraction of CREATE/READONLY flags in the OPFS VFS. FossilOrigin-Name: 0b53be562f1e1a5b20ffe8d72df64e753a8d759b580d949a0f32409144769bb0 --- diff --git a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js index d93a652163..ffa90ed068 100644 --- a/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js +++ b/ext/wasm/api/sqlite3-vfs-opfs.c-pp.js @@ -589,7 +589,7 @@ const installOpfsVfs = function callee(options){ /** Returns an array of the deserialized state stored by the most - recent serialize() operation (from from this thread or the + recent serialize() operation (from this thread or the counterpart thread), or null if the serialization buffer is empty. If passed a truthy argument, the serialization buffer is cleared after deserialization. @@ -924,7 +924,7 @@ const installOpfsVfs = function callee(options){ fh.filename = zName; fh.sab = new SharedArrayBuffer(state.fileBufferSize); fh.flags = flags; - fh.readOnly = !(sqlite3.SQLITE_OPEN_CREATE & flags) + fh.readOnly = !(capi.SQLITE_OPEN_CREATE & flags) && !!(flags & capi.SQLITE_OPEN_READONLY); const rc = opRun('xOpen', pFile, zName, flags, opfsFlags); if(!rc){ diff --git a/manifest b/manifest index 61044f1e6e..4eb4fa510f 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sstorage-size\scounting\sof\snon-local/non-session\skvvfs\sstorage.\sRename\sthe\s'global'\sbuildin\skvvfs\sstorage\sobject\sto\s'localThread'. -D 2025-11-22T16:29:45.039 +C Fix\sa\smisinteraction\sof\sCREATE/READONLY\sflags\sin\sthe\sOPFS\sVFS. +D 2025-11-22T17:27:16.675 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -602,7 +602,7 @@ F ext/wasm/api/sqlite3-opfs-async-proxy.js 9654b565b346dc609b75d15337f20acfa7af7 F ext/wasm/api/sqlite3-vfs-helper.c-pp.js 3f828cc66758acb40e9c5b4dcfd87fd478a14c8fb7f0630264e6c7fa0e57515d F ext/wasm/api/sqlite3-vfs-kvvfs.c-pp.js 31f6241415322d5e52bca4137a63f1f942f61a301041ac99209cc1ae7be0e780 F ext/wasm/api/sqlite3-vfs-opfs-sahpool.c-pp.js 26cb41d5a62f46a106b6371eb00fef02de3cdbfaa51338ba087a45f53028e0d0 -F ext/wasm/api/sqlite3-vfs-opfs.c-pp.js aa330fa0e8ef35cbd92eb0d52e05fbaa07e61540c5cb164e693c82428ce1d763 +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 1837eac45775ca92f28bf94921a2cf7f6f9d7a77955f95005399c57975e7d080 F ext/wasm/api/sqlite3-worker1-promiser.c-pp.js bda1c75bd674a92a0e27cc2f3d46dbbf21e422413f8046814515a0bd7409328a @@ -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 60d61cf383b63b25dcfbf8da9539aaec253b6618ec83403f6690b7a32c13363d -R f4dec3381eda83446cf2c6e058cf08f3 +P 61606be2ae2b0d73cdcd7947a77c7ad87cdf850bba90b0c3e3cdf8c02177db73 +R 54ce506656ff5a47f677e534b68299f2 U stephan -Z 4b959ef5ec765dd5696e7126989a4850 +Z 7d3474159eeb14b7002c4398431607cf # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 8e703377cd..34dda8185e 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -61606be2ae2b0d73cdcd7947a77c7ad87cdf850bba90b0c3e3cdf8c02177db73 +0b53be562f1e1a5b20ffe8d72df64e753a8d759b580d949a0f32409144769bb0