Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

1 files changed, 2 insertions, 8 deletions

diff --git a/src/daemon/MiddleWare.cpp b/src/daemon/MiddleWare.cpp
index 215e7b49..8d62c697 100644
--- a/src/daemon/MiddleWare.cpp
+++ b/src/daemon/MiddleWare.cpp
@@ -351,14 +351,8 @@ report_status_t Report(crash_data_t *client_report,
     for (GList *li = env_list; li; li = g_list_next(li))
     {
         char *s = (char*)li->data;
-        /* Need to make a copy: just cutting s at '=' and unsetenv'ing
-         * the result would be a bug! s _itself_ is in environment now,
-         * we must not modify it there!
-         */
-        char *name = xstrndup(s, strchrnul(s, '=') - s);
-        VERB3 log("Unexporting '%s'", name);
-        unsetenv(name);
-        free(name);
+        VERB3 log("Unexporting '%s'", s);
+        safe_unsetenv(s);
         free(s);
     }
     g_list_free(env_list);