summaryrefslogtreecommitdiff
path: root/src/backend
diff options
context:
space:
mode:
authorBruce Momjian <bruce@momjian.us>2005-08-12 19:42:45 +0000
committerBruce Momjian <bruce@momjian.us>2005-08-12 19:42:45 +0000
commit35379e9079c391754e7a9f54647c84d6e2caece5 (patch)
tree0aa57468d8e60cbe4e062fbdd08f1d955974db31 /src/backend
parenta43ea120bf7539232d9f41a3bf7f7986fde84837 (diff)
downloadpostgresql-35379e9079c391754e7a9f54647c84d6e2caece5.tar.gz
Modify canonicalize_path() so if we would return a trailing "..", throw
an error instead.
Diffstat (limited to 'src/backend')
-rw-r--r--src/backend/postmaster/postmaster.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 765cdf4842..4b2cd5ee95 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -37,7 +37,7 @@
*
*
* IDENTIFICATION
- * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.464 2005/08/12 18:23:53 tgl Exp $
+ * $PostgreSQL: pgsql/src/backend/postmaster/postmaster.c,v 1.465 2005/08/12 19:42:44 momjian Exp $
*
* NOTES
*
@@ -377,8 +377,11 @@ PostmasterMain(int argc, char *argv[])
char *userDoption = NULL;
int i;
- /* This will call exit() if strdup() fails. */
- progname = get_progname(argv[0]);
+ if ((progname = get_progname(argv[0])) == NULL)
+ {
+ printf(_("unable to allocate memory for program name \"%s\".\n"), progname);
+ ExitPostmaster(0);
+ }
MyProcPid = PostmasterPid = getpid();