Kaydet (Commit) be11143b authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Andras Timar

read past end of pCellInfo

Change-Id: Ic024f8dd3aaf368877f5914c6106164508760da8
Reviewed-on: https://gerrit.libreoffice.org/19752Reviewed-by: 's avatarEike Rathke <erack@redhat.com>
Tested-by: 's avatarEike Rathke <erack@redhat.com>
(cherry picked from commit 5ae015fc)
Reviewed-on: https://gerrit.libreoffice.org/19755
(cherry picked from commit 0da689ec)
üst 97ea231b
...@@ -1059,7 +1059,10 @@ void ScOutputData::DrawBackground() ...@@ -1059,7 +1059,10 @@ void ScOutputData::DrawBackground()
for (SCCOL nMerged = 0; nMerged < nMergedCells; ++nMerged) for (SCCOL nMerged = 0; nMerged < nMergedCells; ++nMerged)
{ {
nPosX += pRowInfo[0].pCellInfo[nX+nOldMerged+nMerged].nWidth * nLayoutSign; SCCOL nCol = nX+nOldMerged+nMerged;
if (nCol > nX2+2)
break;
nPosX += pRowInfo[0].pCellInfo[nCol].nWidth * nLayoutSign;
} }
} }
drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, NULL, pOldDataBarInfo, NULL, pOldIconSetInfo ); drawCells( NULL, NULL, pOldColor, pOldBackground, aRect, nPosX, nSignedOneX, mpDev, NULL, pOldDataBarInfo, NULL, pOldIconSetInfo );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment