From cb65cf3c1b5f18ddfd8084c607484384332859c5 Mon Sep 17 00:00:00 2001
From: Lorenz Haas <lykurg@gmail.com>
Date: Thu, 18 Apr 2013 23:12:44 +0200
Subject: [PATCH] Editor: Fix crash with 0-pointer in codeassistant.cpp

Task-number: QTCREATORBUG-9160

Change-Id: Iafc7a8342a91466ac33b07b73a85d9fca228b855
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
---
 .../texteditor/codeassist/codeassistant.cpp       | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/plugins/texteditor/codeassist/codeassistant.cpp b/src/plugins/texteditor/codeassist/codeassistant.cpp
index 54847c05ef2..7d1a0670bca 100644
--- a/src/plugins/texteditor/codeassist/codeassistant.cpp
+++ b/src/plugins/texteditor/codeassist/codeassistant.cpp
@@ -265,14 +265,15 @@ void CodeAssistantPrivate::requestProposal(AssistReason reason,
         }
     }
 
-    IAssistProposal *newProposal = processor->perform(assistInterface);
-    if (kind == QuickFix) {
-        TextEditor::BasicProposalItemListModel *proposalModel =
-                static_cast<TextEditor::BasicProposalItemListModel *>(newProposal->model());
-        proposalModel->setSortingAllowed(false);
-    }
+    if (IAssistProposal *newProposal = processor->perform(assistInterface)) {
+        if (kind == QuickFix) {
+            TextEditor::BasicProposalItemListModel *proposalModel =
+                    static_cast<TextEditor::BasicProposalItemListModel *>(newProposal->model());
+            proposalModel->setSortingAllowed(false);
+        }
 
-    displayProposal(newProposal, reason);
+        displayProposal(newProposal, reason);
+    }
     delete processor;
 }