OSDN Git Service

MergeDocLineDiffs.cpp: Avoid out of bounds access(2). (github#28)
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 23 May 2017 16:01:27 +0000 (01:01 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Tue, 23 May 2017 16:01:27 +0000 (01:01 +0900)
Src/MergeDocLineDiffs.cpp

index e832075..0b289da 100644 (file)
@@ -187,7 +187,7 @@ void CMergeDoc::GetWordDiffArray(int nLineIndex, vector<WordDiff> *pWordDiffs)
 
        for (file = 0; file < m_nBuffers; file++)
        {
-               if (m_ptBuf[file]->GetLineCount() >= nLineEnd)
+               if (nLineEnd >= m_ptBuf[file]->GetLineCount())
                        return;
                nOffsets[file].reset(new int[nLineEnd - nLineBegin + 1]);
                CString strText;