Fix canonicalize_path so "../.." isn't stripped off and ignored.

bmomjian · bmomjian · commit 6a60357588f8 · 2005-08-11T03:53:25.000Z
diff --git a/src/port/path.c b/src/port/path.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $PostgreSQL: pgsql/src/port/path.c,v 1.51 2005/01/26 19:24:03 tgl Exp $
+ *	  $PostgreSQL: pgsql/src/port/path.c,v 1.52 2005/08/11 03:53:25 momjian Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -284,7 +284,10 @@ canonicalize_path(char *path)
 
 		if (len > 2 && strcmp(path + len - 2, "/.") == 0)
 			trim_directory(path);
-		else if (len > 3 && strcmp(path + len - 3, "/..") == 0)
+		/* We can only deal with "/usr/local/..", not "/usr/local/../.." */
+		else if (len > 3 && strcmp(path + len - 3, "/..") == 0 &&
+				 (len != 5 || strcmp(path, "../..") != 0) &&
+				 (len < 6 || strcmp(path + len - 6, "/../..") != 0))
 		{
 			trim_directory(path);
 			trim_directory(path);	/* remove directory above */

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`*`
`9`	`9`	`*`
`10`	`10`	`* IDENTIFICATION`
`11`		`- * $PostgreSQL: pgsql/src/port/path.c,v 1.51 2005/01/26 19:24:03 tgl Exp $`
	`11`	`+ * $PostgreSQL: pgsql/src/port/path.c,v 1.52 2005/08/11 03:53:25 momjian Exp $`
`12`	`12`	`*`
`13`	`13`	`*-------------------------------------------------------------------------`
`14`	`14`	`*/`
`@@ -284,7 +284,10 @@ canonicalize_path(char *path)`
`284`	`284`
`285`	`285`	`if (len > 2 && strcmp(path + len - 2, "/.") == 0)`
`286`	`286`	`trim_directory(path);`
`287`		`- else if (len > 3 && strcmp(path + len - 3, "/..") == 0)`
	`287`	`+ /* We can only deal with "/usr/local/..", not "/usr/local/../.." */`
	`288`	`+ else if (len > 3 && strcmp(path + len - 3, "/..") == 0 &&`
	`289`	`+ (len != 5 \|\| strcmp(path, "../..") != 0) &&`
	`290`	`+ (len < 6 \|\| strcmp(path + len - 6, "/../..") != 0))`
`288`	`291`	`{`
`289`	`292`	`trim_directory(path);`
`290`	`293`	`trim_directory(path); /* remove directory above */`