[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    kdelibs/kdeprint
From:       Waldo Bastian <bastian () kde ! org>
Date:       2004-03-11 12:47:30
Message-ID: 20040311124730.385D499AC () office ! kde ! org
[Download RAW message or body]

CVS commit by waba: 

Better error checking.


  M +1 -0      kpfilterpage.cpp   1.17
  M +5 -0      kprinterimpl.cpp   1.57
  M +5 -0      kxmlcommand.cpp   1.20


--- kdelibs/kdeprint/kpfilterpage.cpp  #1.16:1.17
@@ -119,4 +119,5 @@ void KPFilterPage::slotAddClicked()
         {
                 KXmlCommand     *cmd = KXmlCommandManager::self()->loadCommand(choice);
+                if (!cmd) return; // Error
                 QStringList     filters = activeList();
                 int             pos = KXmlCommandManager::self()->insertCommand(filters, \
cmd->name());

--- kdelibs/kdeprint/kprinterimpl.cpp  #1.56:1.57
@@ -351,4 +351,9 @@ int KPrinterImpl::doFilterFiles(KPrinter
         {
                 KXmlCommand     *filter = KXmlCommandManager::self()->loadCommand(flist[i]);
+                if (!filter)
+                {
+                        printer->setErrorMessage(i18n("<p>Could not load filter description \
for <b>%1</b>.</p>").arg(flist[i])); +                        return -1; // Error
+                }
                 if (i == 0)
                         inputMimeTypes = filter->inputMimeTypes();

--- kdelibs/kdeprint/kxmlcommand.cpp  #1.19:1.20
@@ -609,4 +609,6 @@ void KXmlCommandManager::preload()
                 {
                         KXmlCommand     *xmlCmd = loadCommand(*it);
+                        if (!xmlCmd) continue; // Error!
+
                         QStringList     inputMime = xmlCmd->inputMimeTypes();
                         for (QStringList::ConstIterator mime=inputMime.begin(); \
mime!=inputMime.end(); ++mime) @@ -690,4 +692,7 @@ int KXmlCommandManager::insertCommand(QS
                 {
                         f2 = command(*it);
+                        if (!f2)
+                                return -1; // Shouldn't happen
+
                         if (f2->acceptMimeType(f1->mimeType()) && \
f1->acceptMimeType(mimetype))  {


[prev in list] [next in list] [prev in thread] [next in thread]