database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-30 21:42:05 +03:00
Code Activity

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

Browse Source
This commit is contained in:
Bruce Momjian
2005-08-11 03:53:25 +00:00
parent 24ff62d76f
commit 6a60357588
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/port/path.c
View File

@ -8,7 +8,7 @@
* *
* *
* IDENTIFICATION * 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) if (len > 2 && strcmp(path + len - 2, "/.") == 0)
trim_directory(path); 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);
trim_directory(path); /* remove directory above */ trim_directory(path); /* remove directory above */