From: Michal Rakowski <michal.rakowski@baculasystems.com>
Date: Thu, 15 Oct 2020 13:00:02 +0000 (+0200)
Subject: Fix to avoid null pointers in plugin object struct parsing
X-Git-Tag: Release-11.3.2~986
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47868ce44765b887d8a2e7dde626b1940d0ccb79;p=thirdparty%2Fbacula.git

Fix to avoid null pointers in plugin object struct parsing
---

diff --git a/bacula/src/filed/backup.c b/bacula/src/filed/backup.c
index ece18edeb..b24e5657f 100644
--- a/bacula/src/filed/backup.c
+++ b/bacula/src/filed/backup.c
@@ -1079,19 +1079,19 @@ bool encode_and_send_attributes(bctx_t &bctx)
          POOL_MEM object_source;
          POOL_MEM object_uuid;
 
-         pm_strcpy(path, ff_pkt->plugin_obj.path);
+         pm_strcpy(path, NPRTB(ff_pkt->plugin_obj.path));
          bash_spaces(path.c_str());
-         pm_strcpy(plugin_name, ff_pkt->plugin_obj.plugin_name);
+         pm_strcpy(plugin_name, NPRTB(ff_pkt->plugin_obj.plugin_name));
          bash_spaces(plugin_name.c_str());
-         pm_strcpy(object_type, ff_pkt->plugin_obj.object_type);
+         pm_strcpy(object_type, NPRTB(ff_pkt->plugin_obj.object_type));
          bash_spaces(object_type.c_str());
-         pm_strcpy(object_category, ff_pkt->plugin_obj.object_category);
+         pm_strcpy(object_category, NPRTB(ff_pkt->plugin_obj.object_category));
          bash_spaces(object_category.c_str());
-         pm_strcpy(object_name, ff_pkt->plugin_obj.object_name);
+         pm_strcpy(object_name, NPRTB(ff_pkt->plugin_obj.object_name));
          bash_spaces(object_name.c_str());
-         pm_strcpy(object_source, ff_pkt->plugin_obj.object_source);
+         pm_strcpy(object_source, NPRTB(ff_pkt->plugin_obj.object_source));
          bash_spaces(object_source.c_str());
-         pm_strcpy(object_uuid, ff_pkt->plugin_obj.object_uuid);
+         pm_strcpy(object_uuid, NPRTB(ff_pkt->plugin_obj.object_uuid));
          bash_spaces(object_uuid.c_str());
          sd->msglen = Mmsg(sd->msg, "%s %s %s %s %s %s %s %llu%c",
                            path.c_str(), plugin_name.c_str(), object_category.c_str(), object_type.c_str(),