1 files changed, 8 insertions, 2 deletions
diff --git a/lib/vty.c b/lib/vty.c
index 90e1dadb..4e341bf1 100644
--- a/lib/vty.c
+++ b/lib/vty.c
@@ -2757,9 +2757,15 @@ vty_finish ()
 void
 vty_save_cwd ()
 {
-  char *cwd;
+  char cwd[MAXPATHLEN];
+
+  cwd[0] = getcwd (cwd, MAXPATHLEN);
 
-  cwd = getcwd (NULL, MAXPATHLEN);
+  if (!cwd)
+    {
+      chdir (SYSCONFDIR);
+      cwd[0] = getcwd (cwd, MAXPATHLEN);
+    }
 
   vty_cwd = XMALLOC (MTYPE_TMP, strlen (cwd) + 1);
   strcpy (vty_cwd, cwd);