From: Eric Bollengier <eric@baculasystems.com>
Date: Fri, 24 Apr 2020 15:44:26 +0000 (+0200)
Subject: BEE Backport bacula/src/dird/admin.c
X-Git-Tag: Release-11.3.2~1771
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e17d2c338fbd992e8d76c3c228e5558aa95e90b7;p=thirdparty%2Fbacula.git

BEE Backport bacula/src/dird/admin.c

This commit is the result of the squash of the following main commits:

Author: Eric Bollengier <eric@baculasystems.com>
Date:   Fri Nov 23 10:20:13 2018 +0100

    Fix small memory leak with Admin job
---

diff --git a/bacula/src/dird/admin.c b/bacula/src/dird/admin.c
index a787e9f9a6..e05cb2af0d 100644
--- a/bacula/src/dird/admin.c
+++ b/bacula/src/dird/admin.c
@@ -50,7 +50,9 @@ bool do_admin(JCR *jcr)
 
    jcr->jr.JobId = jcr->JobId;
 
-   jcr->fname = (char *)get_pool_memory(PM_FNAME);
+   if (!jcr->fname) {
+      jcr->fname = get_pool_memory(PM_FNAME);
+   }
 
    /* Print Job Start message */
    Jmsg(jcr, M_INFO, 0, _("Start Admin JobId %d, Job=%s\n"),