From 9c17ee4f934517e51d116e0ae4c0ed31efd25bc8 Mon Sep 17 00:00:00 2001 From: drh <> Date: Thu, 27 Oct 2022 14:00:21 +0000 Subject: [PATCH] Do not accept a NULL pointer for the filename in KVVFS. FossilOrigin-Name: fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186 --- manifest | 12 ++++++------ manifest.uuid | 2 +- src/os_kv.c | 1 + 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/manifest b/manifest index 93ccd49b54..a40fd6acf7 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C The\skvvfs\sVFS\sshould\sremember\sthe\spage\ssize\swhen\swriting\sto\sthe\sdatabase. -D 2022-10-27T12:46:17.474 +C Do\snot\saccept\sa\sNULL\spointer\sfor\sthe\sfilename\sin\sKVVFS. +D 2022-10-27T14:00:21.740 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 @@ -617,7 +617,7 @@ F src/notify.c 89a97dc854c3aa62ad5f384ef50c5a4a11d70fcc69f86de3e991573421130ed6 F src/os.c 81c9c1c52eab711e27e33fd51fe5788488d3a02bc1a71439857abbee5d0d2c97 F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63 F src/os_common.h b2f4707a603e36811d9b1a13278bffd757857b85 -F src/os_kv.c f7cf0e1778a6827df864bb3e49bffbc5a2ef71557d65464df033e2ec6d115d6b +F src/os_kv.c 0e59600d25b72034c7666b8b7dcc527f039b5d9c16f24a7eca4c08c66f63c364 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107 F src/os_unix.c 287aa5f5691a2b356780c63e83abaa33549add84227b8313395f04088486d79c F src/os_win.c 8d129ae3e59e0fa900e20d0ad789e96f2e08177f0b00b53cdda65c40331e0902 @@ -2052,8 +2052,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 ba3a7a4a9997f62b78467d78d95fa5b58a03ecb2e2ccb68f4d316fc08fd02f86 -R b33b563552a619b10e13303be4b4d6d1 +P fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4 +R 6cb19b2a6a261de50cb8a948672510cf U drh -Z 69a517744f2cbe033f11e6c64dfd41a8 +Z 79b8e8e87ee4d06cb8ce6f55cae0e30f # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index bf44b9ac3f..0445a8d662 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -fc5503c8acb085042e877c9de43256a4fee27f63ab35e2ddad18e40734ed00d4 \ No newline at end of file +fdecbd3b5bcdeb358015f461ac6c863f12ab180ab4624ed50734e41e557d8186 \ No newline at end of file diff --git a/src/os_kv.c b/src/os_kv.c index 7bb73ce4fe..322588be9a 100644 --- a/src/os_kv.c +++ b/src/os_kv.c @@ -813,6 +813,7 @@ static int kvvfsOpen( int *pOutFlags ){ KVVfsFile *pFile = (KVVfsFile*)pProtoFile; + if( zName==0 ) zName = ""; SQLITE_KV_LOG(("xOpen(\"%s\")\n", zName)); if( strcmp(zName, "local")==0 || strcmp(zName, "session")==0 -- 2.47.2