From bec35da8bfac1c1c905a0d8a6f35d4b3f9962b31 Mon Sep 17 00:00:00 2001
From: "Marc G. Fournier" <scrappy@hub.org>
Date: Sun, 7 Dec 1997 20:57:45 +0000
Subject: Add error check on getenv("DATADIR") Add code to set DATADIR in
 postmaster.c if -D is used

---
 src/backend/libpq/crypt.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'src/backend/libpq/crypt.c')

diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index c75d8ac459..4e4cb15f81 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -25,9 +25,13 @@ char* crypt_getpwdfilename() {
   static char*     filename = NULL;
 
   if (!filename) {
-    char*     env;
+    char*     env = NULL;
 
     env = getenv("PGDATA");
+    if(env == NULL) {
+      elog(FATAL, "crypt.c: PGDATA is not defined");
+      exit(-1);
+    }
     filename = (char*)malloc(strlen(env) + strlen(CRYPT_PWD_FILE) + 2);
     sprintf(filename, "%s/%s", env, CRYPT_PWD_FILE);
   }
-- 
cgit v1.2.1