[gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.2-oldpimcrash.patch

[gentoo-commits] gentoo-x86 commit in kde-base/plasma-workspace/files: plasma-workspace-4.6.2-oldpimcrash.patch

[Andreas HAttel (dilfridge)]

dilfridge    11/04/18 19:29:32

  Added:                plasma-workspace-4.6.2-oldpimcrash.patch
  Log:
  Add workaround patch for plasma crash with kdepim-4.4, bug 364015
  
  (Portage version: 2.1.9.46/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-base/plasma-workspace/files/plasma-workspace-4.6.2-oldpimcrash.patch?rev=1.1&content-type=text/plain

Index: plasma-workspace-4.6.2-oldpimcrash.patch
===================================================================
commit 3dbdc68fa9fb84fbcc63dbb9acffdf43a1ebfdda
Author: Sergio Martins <iamsergio@gmail.com>
Date:   Thu Apr 7 23:43:17 2011 +0100

    Don't segfault in release mode.
    
    No idea why it's 0, but we're going to delete this copy of calendar.cpp soon,
    so it's a waste of time to debugging it.
    
    PIM applications don't crash at all regarding this, in plasma the ETM is probably
    set incorrectly and has items with unsupported payloads.
    
    BUG: 261593
    (cherry picked from commit b2a322448e644cdf55b9990c90920ce8c0ffcc7f)

diff --git a/plasma/generic/dataengines/calendar/akonadi/calendar.cpp b/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
index 9294f16..c5afa61 100644
--- a/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
+++ b/plasma/generic/dataengines/calendar/akonadi/calendar.cpp
@@ -254,7 +254,10 @@ void Calendar::Private::updateItem( const Akonadi::Item &item, UpdateMode mode )
   const Akonadi::Item::Id id = item.id();
 
   const KCalCore::Incidence::Ptr incidence = CalendarSupport::incidence( item );
-  Q_ASSERT( incidence );
+
+  if ( !incidence ) {
+    return;
+  }
 
   // TODO: remove this debug message in a few months
   kDebug() << "id=" << item.id()