From cef4f7e4feb91ff9d4ba1d9ee411a86bd2af6a16 Mon Sep 17 00:00:00 2001 From: Zufu Liu Date: Mon, 1 Jul 2019 08:22:39 +1000 Subject: Backport: Bug [#2115]. Fix undefined behaviour of shifting signed 1 by 31. Backport of changeset 7614:74b2c724a1df. --- src/MarginView.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/MarginView.cxx b/src/MarginView.cxx index e6f73c52a..a9a5cdb7e 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -267,7 +267,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, const bool firstSubLine = visibleLine == firstVisibleLine; const bool lastSubLine = visibleLine == lastVisibleLine; - int marks = model.pdoc->GetMark(lineDoc); + unsigned int marks = model.pdoc->GetMark(lineDoc); if (!firstSubLine) marks = 0; @@ -284,7 +284,7 @@ void MarginView::PaintMargin(Surface *surface, Sci::Line topLine, PRectangle rc, if (levelNum < levelNextNum) { if (model.pcs->GetExpanded(lineDoc)) { if (levelNum == SC_FOLDLEVELBASE) - marks |= 1 << SC_MARKNUM_FOLDEROPEN; + marks |= 1U << SC_MARKNUM_FOLDEROPEN; else marks |= 1 << folderOpenMid; } else { -- cgit v1.2.3