diff options
author | Zufu Liu <unknown> | 2019-07-01 08:22:39 +1000 |
---|---|---|
committer | Zufu Liu <unknown> | 2019-07-01 08:22:39 +1000 |
commit | f9521fd0e42320f9e8963b4577eaca30d0ce1ea9 (patch) | |
tree | e85a0092db921f854759fbc5cc7cdb434b0f4323 | |
parent | d7e2afd1f88bf735b010461ff505470bfa468547 (diff) | |
download | scintilla-mirror-f9521fd0e42320f9e8963b4577eaca30d0ce1ea9.tar.gz |
Bug [#2115]. Fix undefined behaviour of shifting signed 1 by 31.
-rw-r--r-- | src/MarginView.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/MarginView.cxx b/src/MarginView.cxx index 13d55730f..aaa83373f 100644 --- a/src/MarginView.cxx +++ b/src/MarginView.cxx @@ -268,7 +268,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; @@ -285,7 +285,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 { |