From 2e77734b982d6b64766b51fba5113d62cd44324f Mon Sep 17 00:00:00 2001
From: dan <Dan Kennedy>
Date: Tue, 10 Jan 2023 14:31:56 +0000
Subject: [PATCH] Fix handling of unix paths that contain ".." components such
 that "/" is considered its own parent directory.

FossilOrigin-Name: 3c6cadb396de3981bd950eddd532daa8134bd4bf22c578620e323835c96a8500
---
 manifest          | 19 +++++++++++--------
 manifest.uuid     |  2 +-
 src/os_unix.c     |  8 +++-----
 test/symlink.test | 28 ++++++++++++++++++++++++++++
 4 files changed, 43 insertions(+), 14 deletions(-)

diff --git a/manifest b/manifest
index ad32f5d6f3..07ce0c915b 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Clarify\shelp\sfor\s.quit.
-D 2023-01-09T18:42:28.572
+C Fix\shandling\sof\sunix\spaths\sthat\scontain\s".."\scomponents\ssuch\sthat\s"/"\sis\sconsidered\sits\sown\sparent\sdirectory.
+D 2023-01-10T14:31:56.184
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -629,7 +629,7 @@ F src/os.h 1ff5ae51d339d0e30d8a9d814f4b8f8e448169304d83a7ed9db66a65732f3e63
 F src/os_common.h 6c0eb8dd40ef3e12fe585a13e709710267a258e2c8dd1c40b1948a1d14582e06
 F src/os_kv.c 4d39e1f1c180b11162c6dc4aa8ad34053873a639bac6baae23272fc03349986a
 F src/os_setup.h 6011ad7af5db4e05155f385eb3a9b4470688de6f65d6166b8956e58a3d872107
-F src/os_unix.c 60787ed9f2492a9f2f0ca5cca2d80cdbfd6e8f45a1b1560790ff39c9dfc680c0
+F src/os_unix.c 9107314500e44908e8d2cdf1ed3333ca5fa17dcfdf9c6a079002b4df90d5f806
 F src/os_win.c 295fe45f18bd86f2477f4cd79f3377c6f883ceb941b1f46808665c73747f2345
 F src/os_win.h 7b073010f1451abe501be30d12f6bc599824944a
 F src/pager.c d3122cf67f327f1e2df12d06236a3473a8099542071e257067552f42917f172d
@@ -1569,7 +1569,7 @@ F test/swarmvtab.test 250231404fcac88f61a6c147bb0e3a118ed879278cd3ccb0ae2d3a729e
 F test/swarmvtab2.test c948cb2fdfc5b01d85e8f6d6504854202dc1a0782ab2a0ed61538f27cbd0aa5c
 F test/swarmvtab3.test 41a3ab47cb7a834d4e5336425103b617410a67bb95d335ef536f887587ece073
 F test/swarmvtabfault.test 8a67a9f27c61073a47990829e92bc0c64420a807cb642b15a25f6c788210ed95
-F test/symlink.test 72b22238d4405ba34df8e60b335d290a3b1129fd5c260835c944c1e4e77288a9
+F test/symlink.test 4368af0e213dd6e726a6240a16f2bb96a5a58f83f2d5d60652f27547b28cbf06
 F test/symlink2.test 9531f475a53d8781c4f81373f87faf2e2aff4f5fb2102ec6386e0c827916a670
 F test/sync.test 89539f4973c010eda5638407e71ca7fddbcd8e0594f4c9980229f804d4333092
 F test/sync2.test 8f9f7d4f6d5be8ca8941a8dadcc4299e558cb6a1ff653a9469146c7a76ef2039
@@ -2068,8 +2068,11 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 51a5d83c425d2e31508b73074d0076156817afb19003f847d16bf4a69ae5077b
-R 8395315325bf5149aaad0d9cbdb3c545
-U larrybr
-Z fb84b72fb0f5e2ad6df153dcba612d13
+P 8004a2b7439748f1034df897af7b6c58b48a46923c6fdddbe7d78c89b8d7b438
+R f65bb9fbffc2a5c736d95184bac74647
+T *branch * unix-path-fix
+T *sym-unix-path-fix *
+T -sym-trunk *
+U dan
+Z c7d9af96da1098df86c3ae3359382ebd
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 4b9fb9b09a..34a1e52889 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8004a2b7439748f1034df897af7b6c58b48a46923c6fdddbe7d78c89b8d7b438
\ No newline at end of file
+3c6cadb396de3981bd950eddd532daa8134bd4bf22c578620e323835c96a8500
\ No newline at end of file
diff --git a/src/os_unix.c b/src/os_unix.c
index d248703e9b..c3359f1bc7 100644
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -6462,12 +6462,10 @@ static void appendOnePathElement(
   if( zName[0]=='.' ){
     if( nName==1 ) return;
     if( zName[1]=='.' && nName==2 ){
-      if( pPath->nUsed<=1 ){
-        pPath->rc = SQLITE_ERROR;
-        return;
+      if( pPath->nUsed>1 ){
+        assert( pPath->zOut[0]=='/' );
+        while( pPath->zOut[--pPath->nUsed]!='/' ){}
       }
-      assert( pPath->zOut[0]=='/' );
-      while( pPath->zOut[--pPath->nUsed]!='/' ){}
       return;
     }
   }
diff --git a/test/symlink.test b/test/symlink.test
index 98b2a32c0e..685cae5a41 100644
--- a/test/symlink.test
+++ b/test/symlink.test
@@ -207,4 +207,32 @@ do_test 4.4.2 {
   list [file exists x/test.db-wal] [file exists w/test.db-wal]
 } {1 0}
 
+#-------------------------------------------------------------------------
+# Check that extra ".." in a path are ignored.
+reset_db
+do_execsql_test 5.0 {
+  CREATE TABLE xyz(x, y, z);
+  INSERT INTO xyz VALUES(1, 2, 3);
+}
+
+set path [pwd]
+set nLink [llength [split $path /]]
+set path "[string repeat ../ [expr $nLink*2]]..${path}/test.db"
+
+sqlite3 db2 $path
+do_execsql_test -db db2 5.1 {
+  SELECT * FROM xyz;
+} {1 2 3}
+db close
+
+forcedelete test.db2
+file link test.db2 $path
+sqlite3 db2 test.db2
+do_execsql_test -db db2 5.2 {
+  SELECT * FROM xyz;
+} {1 2 3}
+forcedelete test.db2
+
+
+
 finish_test