From 56978f6605c9978d9142ebfb578fec4e60d57165 Mon Sep 17 00:00:00 2001
From: Takashi Sawanaka <sdottaka@users.sourceforge.net>
Date: Mon, 22 May 2017 00:23:08 +0900
Subject: [PATCH] MergeDocLineDiffs.cpp: Avoid out of bounds access

---
 Src/MergeDocLineDiffs.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Src/MergeDocLineDiffs.cpp b/Src/MergeDocLineDiffs.cpp
index 15abe4aaab8..e8320750e5f 100644
--- a/Src/MergeDocLineDiffs.cpp
+++ b/Src/MergeDocLineDiffs.cpp
@@ -187,6 +187,8 @@ void CMergeDoc::GetWordDiffArray(int nLineIndex, vector<WordDiff> *pWordDiffs)
 
 	for (file = 0; file < m_nBuffers; file++)
 	{
+		if (m_ptBuf[file]->GetLineCount() >= nLineEnd)
+			return;
 		nOffsets[file].reset(new int[nLineEnd - nLineBegin + 1]);
 		CString strText;
 		if (nLineBegin != nLineEnd || m_ptBuf[file]->GetLineLength(nLineEnd) > 0)