Another attempt to fix the endRestoreFile plugin bug noted below

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7667 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/src/filed/fd_plugins.c b/bacula/src/filed/fd_plugins.c
index f0e774d61799adc024a4bb25f1c28beae1b3bb8b..1fc546354d2071847fd90edb9d3445bb6f05a86e 100644 (file)
--- a/bacula/src/filed/fd_plugins.c
+++ b/bacula/src/filed/fd_plugins.c
@@ -278,8 +278,10 @@ void plugin_name_stream(JCR *jcr, char *name)
       /*
        * End of plugin data, notify plugin, then clear flags   
        */
-      plugin = (Plugin *)jcr->plugin;
-      plug_func(plugin)->endRestoreFile((bpContext *)jcr->plugin_ctx);
+      if (jcr->plugin) {
+         plugin = (Plugin *)jcr->plugin;
+         plug_func(plugin)->endRestoreFile((bpContext *)jcr->plugin_ctx);
+      }
       jcr->plugin_ctx = NULL;
       jcr->plugin = NULL;
       goto bail_out;

diff --git a/bacula/technotes-2.5 b/bacula/technotes-2.5
index ebc925f1da9c2b4f31f5158f5872d4cb1fef86a6..0ca060d9c0dd78709a2c88fd54e877fe55714f6a 100644 (file)
--- a/bacula/technotes-2.5
+++ b/bacula/technotes-2.5
@@ -17,6 +17,8 @@ dbdriver
 remove reader/writer in FOPTS????
 
 General:
+30Sep08
+kes  Another attempt to fix the endRestoreFile plugin bug noted below.
 29Sep08
 kes  Apply dbi driver patch from Joao.
 kes  Correct a bug in passing the context to the endRestoreFile() plugin command.