From f8040a1bf6de26abe3a0cc1c64b9608f5bd2fdea Mon Sep 17 00:00:00 2001 From: James Graham Date: Sat, 15 Apr 2023 07:59:05 +0000 Subject: [PATCH] Guard getTagType and isCloseTag Add guard clauses for getTagType and isCloseTag to avoid crashing if the string is empty. CCBUG: 468448 --- src/texthandler.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/texthandler.cpp b/src/texthandler.cpp index 8417bddfc..5d6a1f576 100644 --- a/src/texthandler.cpp +++ b/src/texthandler.cpp @@ -280,6 +280,9 @@ void TextHandler::nextTokenType() QString TextHandler::getTagType() const { + if (m_nextToken.isEmpty()) { + return QString(); + } const int tagTypeStart = m_nextToken[1] == u'/' ? 2 : 1; const int tagTypeEnd = m_nextToken.indexOf(TextRegex::endTagType, tagTypeStart); return m_nextToken.mid(tagTypeStart, tagTypeEnd - tagTypeStart); @@ -287,6 +290,9 @@ QString TextHandler::getTagType() const bool TextHandler::isCloseTag() const { + if (m_nextToken.isEmpty()) { + return false; + } return m_nextToken[1] == u'/'; }