MergeDocLineDiffs.cpp: Avoid out of bounds access

WinMerge · May 21, 2017 · 56978f6 · 56978f6
1 parent 0dbaeb2
commit 56978f6
Showing 1 changed file with 2 additions and 0 deletions.
diff --git 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)