[Bacula-commits] git: Bacula branch, master, updated. 79659918c65907a3e967d788ed975e0d738bc449

[Kern S. <ke...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Bacula".

The branch, master has been updated
       via  79659918c65907a3e967d788ed975e0d738bc449 (commit)
       via  7d5e5c18ee4a5531f49a2fc9a1b3299712ef665d (commit)
      from  0915570f4636ac1216a136eb767c14560932fa9c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 79659918c65907a3e967d788ed975e0d738bc449
Merge: 7d5e5c18ee4a5531f49a2fc9a1b3299712ef665d 0915570f4636ac1216a136eb767c14560932fa9c
Author: Kern Sibbald <ke...@si...>
Date:   Mon Feb 1 18:51:17 2010 +0100

    Merge branch 'master' of ssh://bacula.git.sourceforge.net/gitroot/bacula/bacula

commit 7d5e5c18ee4a5531f49a2fc9a1b3299712ef665d
Author: Kern Sibbald <ke...@si...>
Date:   Mon Feb 1 18:50:56 2010 +0100

    Fix seg fault in bscan from new comment field

-----------------------------------------------------------------------

Summary of changes:
diff --git a/bacula/src/stored/butil.c b/bacula/src/stored/butil.c
index adf41d8..ddd7cc3 100644
--- a/bacula/src/stored/butil.c
+++ b/bacula/src/stored/butil.c
@@ -1,7 +1,7 @@
 /*
    Bacula® - The Network Backup Solution
 
-   Copyright (C) 2000-2007 Free Software Foundation Europe e.V.
+   Copyright (C) 2000-2010 Free Software Foundation Europe e.V.
 
    The main author of Bacula is Kern Sibbald, with contributions from
    many others, a complete list can be found in the file AUTHORS.
@@ -105,7 +105,8 @@ JCR *setup_jcr(const char *name, char *dev_name, BSR *bsr,
    pm_strcpy(jcr->fileset_name, "Dummy.fileset.name");
    jcr->fileset_md5 = get_pool_memory(PM_FNAME);
    pm_strcpy(jcr->fileset_md5, "Dummy.fileset.md5");
-
+   jcr->comment = get_pool_memory(PM_MESSAGE);
+   *jcr->comment = '\0';
    init_autochangers();
    create_volume_lists();
 
@@ -222,6 +223,10 @@ static void my_free_jcr(JCR *jcr)
       free_pool_memory(jcr->fileset_md5);
       jcr->fileset_md5 = NULL;
    }
+   if (jcr->comment) {
+      free_pool_memory(jcr->comment);
+      jcr->comment = NULL;
+   }
    if (jcr->VolList) {
       free_restore_volume_list(jcr);
    }


hooks/post-receive
-- 
Bacula