From 18fc5e3f9186b38d952e21d03706a49b25e39c67 Mon Sep 17 00:00:00 2001
From: jkobus <jaroslaw.kobus@digia.com>
Date: Tue, 15 Apr 2014 16:12:10 +0200
Subject: [PATCH] DiffEditor: replace carriage return chars with spaces.

Make sure text block is valid before using its layout.

Task-number: QTCREATORBUG-12056
Change-Id: I618edfcf549b675282587aed577810b806692bd4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
 src/plugins/diffeditor/sidebysidediffeditorwidget.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
index 6da541b0ecc..f33f9bb813c 100644
--- a/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
+++ b/src/plugins/diffeditor/sidebysidediffeditorwidget.cpp
@@ -287,6 +287,9 @@ void MultiHighlighter::highlightBlock(const QString &text)
     QTextBlock documentBlock = currentDocument->findBlockByNumber(
                 block.blockNumber() - m_editor->blockNumberForFileIndex(fileIndex));
 
+    if (!documentBlock.isValid())
+        return;
+
     QList<QTextLayout::FormatRange> formats = documentBlock.layout()->additionalFormats();
     setExtraAdditionalFormats(block, formats);
 }
@@ -960,6 +963,8 @@ void SideBySideDiffEditorWidget::showDiff()
                 blockNumber++;
             }
         }
+        leftText.replace(QChar::CarriageReturn, QChar::Space);
+        rightText.replace(QChar::CarriageReturn, QChar::Space);
         leftTexts += leftText;
         rightTexts += rightText;
         leftDocs.append(qMakePair(contextFileData.leftFileInfo, leftText));