From d937a0c32e418414c7e9911927a1518ac586b9d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomas=20=C3=85kesson?= Date: Sun, 2 Apr 2023 14:50:38 +0200 Subject: [PATCH] Fix crash when encountering incomplete ANSI codes Add bounds checking before increasing iterator pointer, to prevent incomplete ANSI codes causing iterators going to far. --- src/renderers/renderhelpers.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/renderers/renderhelpers.cpp b/src/renderers/renderhelpers.cpp index 9851c99..c9ffc7e 100644 --- a/src/renderers/renderhelpers.cpp +++ b/src/renderers/renderhelpers.cpp @@ -159,10 +159,10 @@ static void parseSGR( format.setFontStrikeOut(false); break; case SetForeground: - if (args.size() > 2) + if (args.size() > 2 && std::next(it) != args.cend()) { const auto colMode = *++it; - if (colMode == 5) + if (colMode == 5 && std::next(it) != args.cend()) { const auto colNum = *++it; setColor(format, colNum); @@ -170,7 +170,7 @@ static void parseSGR( else if (colMode == 2) { ++it; - if (args.size() >= 4) + if (std::next(it, 3) <= args.cend()) { const auto red = *it; const auto green = *++it; @@ -184,10 +184,10 @@ static void parseSGR( format.setForeground(defaultFormat.foreground()); break; case SetBackground: - if (args.size() > 2) + if (args.size() > 2 && std::next(it) != args.cend()) { const auto colMode = *++it; - if (colMode == 5) + if (colMode == 5 && std::next(it) != args.cend()) { const auto colNum = *++it; setColor(format, colNum, true); @@ -195,7 +195,7 @@ static void parseSGR( else if (colMode == 2) { ++it; - if (args.size() >= 4) + if (std::next(it, 3) <= args.cend()) { const auto red = *it; const auto green = *++it;