Backport from Bacula Enterprise

[bacula/bacula] / bacula / src / qt-console / fileset / fileset.cpp

diff --git a/bacula/src/qt-console/fileset/fileset.cpp b/bacula/src/qt-console/fileset/fileset.cpp
index 089f49f547f33bd917b45034107353b6ddc02162..1a8a3f97fd99fd78172a6c4407704e0af26d9f59 100644 (file)
--- a/bacula/src/qt-console/fileset/fileset.cpp
+++ b/bacula/src/qt-console/fileset/fileset.cpp
@@ -1,34 +1,24 @@
 /*
-   Bacula® - The Network Backup Solution
+   Bacula(R) - The Network Backup Solution
 
+   Copyright (C) 2000-2015 Kern Sibbald
    Copyright (C) 2007-2009 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.
-   This program is Free Software; you can redistribute it and/or
-   modify it under the terms of version three of the GNU Affero General Public
-   License as published by the Free Software Foundation and included
-   in the file LICENSE.
-
-   This program is distributed in the hope that it will be useful, but
-   WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-   General Public License for more details.
-
-   You should have received a copy of the GNU Affero General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-   02110-1301, USA.
-
-   Bacula® is a registered trademark of Kern Sibbald.
-   The licensor of Bacula is the Free Software Foundation Europe
-   (FSFE), Fiduciary Program, Sumatrastrasse 25, 8006 Zürich,
-   Switzerland, email:ftf@fsfeurope.org.
+   The original author of Bacula is Kern Sibbald, with contributions
+   from many others, a complete list can be found in the file AUTHORS.
+
+   You may use this file and others of this release according to the
+   license defined in the LICENSE file, which includes the Affero General
+   Public License, v3.0 ("AGPLv3") and some additional permissions and
+   terms pursuant to its AGPLv3 Section 7.
+
+   This notice must be preserved when any source code is 
+   conveyed and/or propagated.
+
+   Bacula(R) is a registered trademark of Kern Sibbald.
 */
  
 /*
- *   Version $Id$
- *
  *  FileSet Class
  *
  *   Dirk Bartley, March 2007
@@ -41,7 +31,7 @@
 #include "fileset/fileset.h"
 #include "util/fmtwidgetitem.h"
 
-FileSet::FileSet()
+FileSet::FileSet() : Pages()
 {
    setupUi(this);
    m_name = tr("FileSets");
@@ -70,7 +60,6 @@ FileSet::~FileSet()
  */
 void FileSet::populateTable()
 {
-   m_populated = true;
 
    Freeze frz(*tableWidget); /* disable updating*/
 
@@ -122,6 +111,10 @@ void FileSet::populateTable()
          /* Iterate through the record returned from the query */
          foreach (QString resultline, results) {
             fieldlist = resultline.split("\t");
+            if (fieldlist.size() != 3) {
+               Pmsg1(000, "Unexpected line %s", resultline.toUtf8().data());
+               continue;
+            }
 
             /* remove this fileSet from notFoundList */
             int indexOf = notFoundList.indexOf(fieldlist[0]);
@@ -171,6 +164,7 @@ void FileSet::populateTable()
          }
       }
    }
+   m_populated = true;
 }
 
 /*
@@ -195,7 +189,7 @@ void FileSet::PgSeltreeWidgetClicked()
 void FileSet::tableItemChanged(QTableWidgetItem *currentwidgetitem, QTableWidgetItem *previouswidgetitem)
 {
    /* m_checkcurwidget checks to see if this is during a refresh, which will segfault */
-   if (m_checkcurwidget) {
+   if (m_checkcurwidget && currentwidgetitem) {
       int currentRow = currentwidgetitem->row();
       QTableWidgetItem *currentrowzeroitem = tableWidget->item(currentRow, 0);
       m_currentlyselected = currentrowzeroitem->text();
@@ -252,7 +246,7 @@ void FileSet::consoleShowFileSet()
  */
 void FileSet::currentStackItem()
 {
-   if(!m_populated) {
+   if (!m_populated) {
       populateTable();
       /* Create the context menu for the fileset table */
       createContextMenu();