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

List:       kde-commits
Subject:    branches/work/kmail-nommap
From:       Jaroslaw Staniek <js () iidea ! pl>
Date:       2008-05-02 20:15:01
Message-ID: 1209759301.167152.30584.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 803421 by staniek:

avoid crashes when msgBase == 0


 M  +7 -4      kmheaders.cpp  


--- branches/work/kmail-nommap/kmheaders.cpp #803420:803421
@@ -655,8 +655,9 @@
   config.writeEntry("Current", currentItemIndex());
   HeaderItem* current = currentHeaderItem();
   ulong sernum = 0;
-  if ( current && mFolder->getMsgBase( current->msgId() ) )
-    sernum = mFolder->getMsgBase( current->msgId() )->getMsgSerNum();
+  KMMsgBase* msgBase;
+  if ( current && (msgBase = mFolder->getMsgBase( current->msgId() ) ) )
+    sernum = msgBase->getMsgSerNum();
   config.writeEntry("CurrentSerialNum", (qulonglong) sernum );
 
   config.writeEntry("OrderOfArrival", mPaintInfo.orderOfArrival );
@@ -3604,7 +3605,8 @@
     if ( it.current()->isSelected() && it.current()->isVisible() ) {
       HeaderItem* item = static_cast<HeaderItem*>( it.current() );
       KMMsgBase *msgBase = mFolder->getMsgBase( item->msgId() );
-      list.append( msgBase->getMsgSerNum() );
+      if ( msgBase )
+        list.append( msgBase->getMsgSerNum() );
     }
   }
   return list;
@@ -3628,7 +3630,8 @@
       }
       HeaderItem *item = static_cast<HeaderItem*>(it.current());
       KMMsgBase *msgBase = mFolder->getMsgBase( item->msgId() );
-      list.append( msgBase->getMsgSerNum() );
+      if ( msgBase )
+        list.append( msgBase->getMsgSerNum() );
     }
     ++it;
   }
[prev in list] [next in list] [prev in thread] [next in thread]