From: Kern Sibbald <kern@sibbald.com>
Date: Wed, 26 Aug 2009 16:56:54 +0000 (+0200)
Subject: Release orphanned buffers in accurate code
X-Git-Tag: Release-5.0.0~325^2~7
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9c4f7c2ab35c9d405e0533133f8e0a5966c1acc1;p=bacula%2Fbacula

Release orphanned buffers in accurate code
---

diff --git a/bacula/src/dird/backup.c b/bacula/src/dird/backup.c
index 029dfa0c89..bcc02c9120 100644
--- a/bacula/src/dird/backup.c
+++ b/bacula/src/dird/backup.c
@@ -131,11 +131,13 @@ static int accurate_list_handler(void *ctx, int num_fields, char **row)
 bool send_accurate_current_files(JCR *jcr)
 {
    POOL_MEM buf;
+   POOLMEM *jobids;
+   POOLMEM *nb;
 
    if (!jcr->accurate || job_canceled(jcr) || jcr->get_JobLevel()==L_FULL) {
       return true;
    }
-   POOLMEM *jobids = get_pool_memory(PM_FNAME);
+   jobids = get_pool_memory(PM_FNAME);
 
    db_accurate_get_jobids(jcr, jcr->db, &jcr->jr, jobids);
 
@@ -148,7 +150,7 @@ bool send_accurate_current_files(JCR *jcr)
       Jmsg(jcr, M_INFO, 0, _("Sending Accurate information.\n"));
    }
    /* to be able to allocate the right size for htable */
-   POOLMEM *nb = get_pool_memory(PM_FNAME);
+   nb = get_pool_memory(PM_FNAME);
    *nb = 0;                           /* clear buffer */
    Mmsg(buf, "SELECT sum(JobFiles) FROM Job WHERE JobId IN (%s)",jobids);
    db_sql_query(jcr->db, buf.c_str(), db_get_int_handler, nb);
@@ -156,7 +158,9 @@ bool send_accurate_current_files(JCR *jcr)
    jcr->file_bsock->fsend("accurate files=%s\n", nb); 
 
    if (!db_open_batch_connexion(jcr, jcr->db)) {
-      Jmsg0(jcr, M_FATAL, 0, "Can't get dedicate sql connexion");
+      free_pool_memory(jobids);
+      free_pool_memory(nb);
+      Jmsg0(jcr, M_FATAL, 0, "Can't get batch sql connexion");
       return false;
    }
 
diff --git a/bacula/technotes b/bacula/technotes
index 7c9fbc7ab1..a762c96650 100644
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -2,6 +2,9 @@
           
 General:
 
+26Aug09
+kes  Fix possible seg fault in db_get_int_handler in accurate code
+kes  Release orphanned buffers in accurate code.
 25Aug09
 kes  Suppress some error messages generated after cancelling a job.
      This should reduce some of the unwanted error messages after