rev 9848 - in trunk/packages/kdepim/debian: . patches

[Modestas Vainius]

Author: modax-guest
Date: 2008-03-25 14:07:52 +0000 (Tue, 25 Mar 2008)
New Revision: 9848

Added:
   trunk/packages/kdepim/debian/patches/20_maildir_foldersize_race.diff
Modified:
   trunk/packages/kdepim/debian/changelog
Log:
A speculated fix for #469834. Untested, needs confirmation.

Modified: trunk/packages/kdepim/debian/changelog
===================================================================
--- trunk/packages/kdepim/debian/changelog	2008-03-25 10:52:36 UTC (rev 9847)
+++ trunk/packages/kdepim/debian/changelog	2008-03-25 14:07:52 UTC (rev 9848)
@@ -1,11 +1,18 @@
-kdepim (4:3.5.9-3~unreleased1) UNRELEASED; urgency=low
+kdepim (4:3.5.9-3~unreleased2) UNRELEASED; urgency=low
 
   +++ Changes by Sune Vuorela:
 
   * Remove dimap warning. kmail is stable now.
 
- -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 17 Mar 2008 00:16:43 +0100
+  +++ Changes by Modestas Vainius:
 
+  * Add 20_maildir_foldersize_race.diff. It should fix a race between
+    slotDirSizeJobResult() and doFolderSize() in kmfoldermaildir.cpp which
+    could lead to crashes (Really closes: #469834). NOTE: #469834 was
+    hijacked for gpgme issue.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 25 Mar 2008 15:56:38 +0200
+
 kdepim (4:3.5.9-2) unstable; urgency=low
 
   * Rebuilt against kdelibs and libgpgme with updated shlibs 

Added: trunk/packages/kdepim/debian/patches/20_maildir_foldersize_race.diff
===================================================================
--- trunk/packages/kdepim/debian/patches/20_maildir_foldersize_race.diff	                        (rev 0)
+++ trunk/packages/kdepim/debian/patches/20_maildir_foldersize_race.diff	2008-03-25 14:07:52 UTC (rev 9848)
@@ -0,0 +1,29 @@
+--- kdepim-3.5.9/kmail/kmfoldermaildir.cpp	2008-03-25 15:49:54.000000000 +0200
++++ kdepim-3.5.9/kmail/kmfoldermaildir.cpp	2008-03-25 15:54:15.000000000 +0200
+@@ -1134,7 +1134,6 @@
+ 
+ void KMFolderMaildir::slotDirSizeJobResult( KIO::Job* job )
+ {
+-    mCurrentlyCheckingFolderSize = false;
+     KDirSize * dirsize = dynamic_cast<KDirSize*>( job );
+     if ( dirsize && ! dirsize->error() )
+     {
+@@ -1159,7 +1158,7 @@
+         KDirSize* job = KDirSize::dirSizeJob( entry.second );
+         connect( job, SIGNAL( result( KIO::Job* ) ),
+                  entry.first, SLOT( slotDirSizeJobResult( KIO::Job* ) ) );
+-        break;
++        return;
+       }
+       else
+       {
+@@ -1167,6 +1166,9 @@
+         s_DirSizeJobQueue.pop_front();
+       }
+     }
++
++    // If we are here, folder size calculation is complete
++    mCurrentlyCheckingFolderSize = false;
+ }
+ 
+ #include "kmfoldermaildir.moc"