Fix SEGV if $HOME or $PWD are unset in the environment (bnc #578684)

diff --git a/src/Zypper.cc b/src/Zypper.cc
index b80c623..e2c52a4 100644 (file)
--- a/src/Zypper.cc
+++ b/src/Zypper.cc
@@ -698,9 +698,13 @@ void Zypper::commandShell()
 
   string histfile;
   try {
-    Pathname p (getenv ("HOME"));
-    p /= ".zypper_history";
-    histfile = p.asString ();
+    const char * env = getenv ("HOME");
+    if ( env )
+    {
+      Pathname p( env );
+      p /= ".zypper_history";
+      histfile = p.asString ();
+    }
   } catch (...) {
     // no history
   }

diff --git a/src/utils/Augeas.cc b/src/utils/Augeas.cc
index e3580f1..f0e1c4f 100644 (file)
--- a/src/utils/Augeas.cc
+++ b/src/utils/Augeas.cc
@@ -35,7 +35,8 @@ Augeas::Augeas(const string & file)
     want_custom = true;
     if (filepath.relative())
     {
-      string wd = ::getenv("PWD");
+      const char * env = ::getenv("PWD");
+      string wd = env ? env : ".";
       filepath = wd / filepath;
     }
 
@@ -44,7 +45,9 @@ Augeas::Augeas(const string & file)
   }
   else
   {
-    _homedir = ::getenv("HOME");
+    const char * env = ::getenv("HOME");
+    if ( env )
+      _homedir = env;
     if (_homedir.empty())
       WAR << "Cannot figure out user's home directory. Skipping user's config." << endl;
     else