From: Olivier Goffart <ogoffart@woboq.com>
Date: Thu, 16 Mar 2017 13:25:08 +0000 (+0100)
Subject: ActivityListModel: attempt to fix a crash.
X-Git-Tag: archive/raspbian/3.16.7-1_deb13u1+rpi1~1^2~789^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a60370255e31708bf85d8cf36e917980c51a36f6;p=nextcloud-desktop.git

ActivityListModel: attempt to fix a crash.

The backtrace seems to indicate that the account is invalid.
I don't know how this can happen, maybe the account's display
name was changed while the app is running?

Backtrace:
Crash: EXC_BAD_ACCESS / KERN_INVALID_ADDRESS at 0x18
  Module "owncloud", in OCC::AccountState::account
  Module "owncloud", in OCC::ActivityListModel::data
  Module "owncloud", in OCC::ActivityItemDelegate::paint
  Module "QtWidgets", in QListView::paintEvent
  Module "QtWidgets", in QWidget::event
  Module "QtWidgets", in QFrame::event
  Module "QtWidgets", in QAbstractScrollArea::viewportEvent
  Module "QtWidgets", in QAbstractItemView::viewportEvent
  Module "QtWidgets", in QAbstractScrollAreaFilter::eventFilter
  Module "QtCore", in QCoreApplicationPrivate::sendThroughObjectEventFilters
---

diff --git a/src/gui/activitylistmodel.cpp b/src/gui/activitylistmodel.cpp
index f6658db00..b4d213c85 100644
--- a/src/gui/activitylistmodel.cpp
+++ b/src/gui/activitylistmodel.cpp
@@ -47,6 +47,8 @@ QVariant ActivityListModel::data(const QModelIndex &index, int role) const
 
     a = _finalList.at(index.row());
     AccountStatePtr ast = AccountManager::instance()->account(a._accName);
+    if (!ast)
+        return QVariant();
     QStringList list;
 
     switch (role) {