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

List:       kde-commits
Subject:    branches/kdepim/enterprise4/kdepimlibs
From:       Thomas McGuire <mcguire () kde ! org>
Date:       2009-09-23 16:37:30
Message-ID: 1253723850.352081.11644.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1027241 by tmcguire:

The commit message below is wrong, this is actually a crash fix when exiting Kontact.
Merged revisions 1026793 via svnmerge from 
svn+ssh://tmcguire@svn.kde.org/home/kde/branches/KDE/4.3/kdepimlibs

........
  r1026793 | winterz | 2009-09-22 18:18:41 +0200 (Tue, 22 Sep 2009) | 8 lines
  
  Backport r1019799 by winterz from trunk to the 4.3 branch:
  
  Fix "kmail: Kiosk-based [$e] config variables are not evaluated for file \
emailidentities"  Thanks for the patch Jörg!
  CCBUG: 197523
  MERGE: e4,4.3
........


 _M            . (directory)  
 M  +12 -0     kcal/calendar.cpp  


** branches/kdepim/enterprise4/kdepimlibs #property svnmerge-integrated
   - /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,9 \
96755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435
  + /branches/KDE/4.3/kdepimlibs:1-986158,990023,990532,990575,990631,990684,991932,99 \
6755,997101,997490,998251,1000615,1007460,1008037,1008812,1009437,1011841,1013328-1013 \
                331,1013810,1015198,1015975-1016224,1016226-1016229,1019800,1021325,1024435,1026793
                
--- branches/kdepim/enterprise4/kdepimlibs/kcal/calendar.cpp #1027240:1027241
@@ -878,6 +878,18 @@
       }
     }
   }
+
+  // Make sure the deleted incidence doesn't relate to a non-deleted incidence, \
since +  // that would cause trouble in CalendarLocal::close(), as the deleted \
incidences +  // are destroyed after the non-deleted incidences. The destructor of \
the deleted +  // incidences would then try to access the already destroyed \
non-deleted incidence, +  // which would segfault.
+  //
+  // So in short: Make sure dead incidences don't point to alive incidences via the
+  // relation.
+  //
+  // This crash is tested in CalendarLocalTest::testRelationsCrash().
+  incidence->setRelatedTo( 0 );
 }
 
 void Calendar::CalendarObserver::calendarModified( bool modified, Calendar *calendar \
)


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