Merge branch 'master' into basejobv3

[bacula/bacula] / bacula / src / findlib / find_one.c

diff --git a/bacula/src/findlib/find_one.c b/bacula/src/findlib/find_one.c
index f2ddbbf75531a68ea457582523c67342a6fc13a7..8f6aa371be6c2b2db431dc41fc2d3ec52e7980a3 100644 (file)
--- a/bacula/src/findlib/find_one.c
+++ b/bacula/src/findlib/find_one.c
@@ -303,7 +303,13 @@ static bool have_ignoredir(FF_PKT *ff_pkt)
 {
    struct stat sb;
    char tmp_name[MAXPATHLEN];
-   char *ignoredir = ff_pkt->fileset->incexe->ignoredir;
+   char *ignoredir;
+
+   /* Ensure that pointers are defined */
+   if (!ff_pkt->fileset || !ff_pkt->fileset->incexe) {
+      return false;
+   }
+   ignoredir = ff_pkt->fileset->incexe->ignoredir;
    
    if (ignoredir) {
       if (strlen(ff_pkt->fname) + strlen(ignoredir) + 2 > MAXPATHLEN) {