From e3eed354f3787236ab4d548cc17837d6ec7ee7f0 Mon Sep 17 00:00:00 2001 From: Takashi Sawanaka Date: Mon, 18 Mar 2019 22:39:49 +0900 Subject: [PATCH] MergeStatusBar.cpp: Fix rare crash when maximizing MDI child window --HG-- branch : stable --- Src/MergeStatusBar.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Src/MergeStatusBar.cpp b/Src/MergeStatusBar.cpp index e31d5aa8b..5add31f94 100644 --- a/Src/MergeStatusBar.cpp +++ b/Src/MergeStatusBar.cpp @@ -133,6 +133,8 @@ void CMergeStatusBar::DrawItem(LPDRAWITEMSTRUCT lpDrawItemStruct) { const int pbase = PANE_PANE0_INFO + (lpDrawItemStruct->itemID - PANE_PANE0_INFO) % nColumnsPerPane; const int pcur = (lpDrawItemStruct->itemID - PANE_PANE0_INFO) / nColumnsPerPane; + if (pcur >= m_nPanes) + return; std::vector ptext(m_nPanes); for (int pane = 0; pane < m_nPanes; ++pane) ptext[pane] = GetPaneText(pbase + pane * nColumnsPerPane); -- 2.11.0