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

List:       kde-commits
Subject:    KDE/kdepim/kmail
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2008-09-30 19:00:40
Message-ID: 1222801240.581487.29621.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 866389 by tmcguire:

Fix suspicous code which would lead to crashes under certain circumstances.
Thanks to Christoph Bartoschek for detecting those!


 M  +2 -2      foldertreebase.cpp  
 M  +1 -1      kmfoldercachedimap.cpp  
 M  +2 -1      kmfoldertree.cpp  
 M  +2 -1      kmmainwidget.cpp  


--- trunk/KDE/kdepim/kmail/foldertreebase.cpp #866388:866389
@@ -212,7 +212,7 @@
     }
   }
   if ( isSizeActive() || force ) {
-    if ( !fti->folder()->noContent() ) {
+    if ( folder && !fti->folder()->noContent() ) {
       int size = folder->storage()->folderSize();
       if ( size != fti->folderSize() ) {
         fti->setFolderSize( size );
@@ -220,7 +220,7 @@
       }
     }
   }
-  if ( fti->folderIsCloseToQuota() != folder->storage()->isCloseToQuota() ) {
+  if ( folder && ( fti->folderIsCloseToQuota() != \
folder->storage()->isCloseToQuota() ) ) {  fti->setFolderIsCloseToQuota( \
folder->storage()->isCloseToQuota() );  }
 
--- trunk/KDE/kdepim/kmail/kmfoldercachedimap.cpp #866388:866389
@@ -3064,7 +3064,7 @@
       break;
     }
     KMFolderDir *inboxDir = inboxFolder->child();
-    if ( !inboxDir && !inboxFolder->storage() )
+    if ( !inboxDir || !inboxFolder->storage() )
       break;
     assert( inboxFolder->storage()->folderType() == KMFolderTypeCachedImap );
 
--- trunk/KDE/kdepim/kmail/kmfoldertree.cpp #866388:866389
@@ -1993,7 +1993,8 @@
     if ( source )
       sourceFolderName = source->label();
 
-    if ( parent->hasNamedFolder( sourceFolderName ) || sourceFolderNames.contains( \
sourceFolderName ) ) { +    if ( parent && ( parent->hasNamedFolder( sourceFolderName \
) || +         sourceFolderNames.contains( sourceFolderName ) ) ) {
       KMessageBox::error( this, i18n("<qt>Cannot move or copy folder <b>%1</b> here \
because a folder with the same name already exists.</qt>", sourceFolderName ) );  \
return;  }
--- trunk/KDE/kdepim/kmail/kmmainwidget.cpp #866388:866389
@@ -1959,7 +1959,8 @@
                                : reader.readEntry( "useFixedFont", false );
   KMCommand *command =
     new KMPrintCommand( this, mHeaders->currentMsg(),
-                        mMsgView->headerStyle(), mMsgView->headerStrategy(),
+                        mMsgView ? mMsgView->headerStyle() : 0,
+                        mMsgView ? mMsgView->headerStrategy() : 0,
                         htmlOverride, htmlLoadExtOverride,
                         useFixedFont, overrideEncoding() );
   command->start();


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