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

List:       kde-commits
Subject:    [kdepim/4.7] akregator/src: Fix the Akregator segfault when the
From:       Marta Rybczynska <marta () rybczynska ! net>
Date:       2011-08-31 21:26:12
Message-ID: 20110831212612.383CDA6078 () git ! kde ! org
[Download RAW message or body]

Git commit a5dc1aee44429faa770086b5797032fb0409d7a2 by Marta Rybczynska.
Committed on 31/08/2011 at 22:12.
Pushed by mrybczyn into branch '4.7'.

Fix the Akregator segfault when the feed list is damaged, and we try to add a new feed.

The reason for this is that the FeedList object to be used is never correctly created,
do it stays at 0. This patch provides possibly the easiest solution to the problem:
when the feed is damaged, we use the default feed.

FIXED-IN: 4.7.1
BUG: 245911
REVIEW: 102333
(cherry picked from commit ff1fd36bf88562588e3899e1d81e5d410857ebbe)

M  +1    -1    akregator/src/loadfeedlistcommand.cpp

http://commits.kde.org/kdepim/a5dc1aee44429faa770086b5797032fb0409d7a2

diff --git a/akregator/src/loadfeedlistcommand.cpp b/akregator/src/loadfeedlistcommand.cpp
index dda20a4..097c013 100644
--- a/akregator/src/loadfeedlistcommand.cpp
+++ b/akregator/src/loadfeedlistcommand.cpp
@@ -166,7 +166,7 @@ void LoadFeedListCommand::Private::doLoad() {
         KMessageBox::detailedError( q->parentWidget(), msg, details, title );
 
         if ( that )
-            emitResult( shared_ptr<FeedList>() );
+            handleDocument( defaultFeedList );
         return;
     }
 

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