From f0eb7735d8cdf44ebf7064613add363ddda329b0 Mon Sep 17 00:00:00 2001

From: Lennart Poettering <lennart@poettering.net>

Date: Mon, 3 Mar 2014 17:11:39 +0100

Subject: [PATCH] execute: free directory path if we fail to remove it because

 we cannot allocate a thread

(cherry picked from commit 98b47d54ce946ad3524f84eb38d2413498a333dc)

---

 src/core/execute.c | 18 ++++++++++++++++--

 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/core/execute.c b/src/core/execute.c

index a328fc2..bb06507 100644

--- a/src/core/execute.c

+++ b/src/core/execute.c

@@ -2579,6 +2579,8 @@ static void *remove_tmpdir_thread(void *p) {

 }

 void exec_runtime_destroy(ExecRuntime *rt) {

+        int r;

+

         if (!rt)

                 return;

@@ -2588,13 +2590,25 @@ void exec_runtime_destroy(ExecRuntime *rt) {

         if (rt->tmp_dir) {

                 log_debug("Spawning thread to nuke %s", rt->tmp_dir);

-                asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);

+

+                r = asynchronous_job(remove_tmpdir_thread, rt->tmp_dir);

+                if (r < 0) {

+                        log_warning("Failed to nuke %s: %s", rt->tmp_dir, strerror(-r));

+                        free(rt->tmp_dir);

+                }

+

                 rt->tmp_dir = NULL;

         }

         if (rt->var_tmp_dir) {

                 log_debug("Spawning thread to nuke %s", rt->var_tmp_dir);

-                asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);

+

+                r = asynchronous_job(remove_tmpdir_thread, rt->var_tmp_dir);

+                if (r < 0) {

+                        log_warning("Failed to nuke %s: %s", rt->var_tmp_dir, strerror(-r));

+                        free(rt->var_tmp_dir);

+                }

+

                 rt->var_tmp_dir = NULL;

         }