Skip to content

qtbase: fix crash in QString::at on malformed unicode #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
overdeadsss wants to merge 1 commit into
base: master
Choose a base branch
from
Open

qtbase: fix crash in QString::at on malformed unicode #249

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions qtbase_5.15.18/0034-add-bounds-check-to-qstring-accessors.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 5bec5dffbe6..b40de24431a 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1066,11 +1066,20 @@ inline QString::QString(QLatin1String aLatin1) : d(fromLatin1_helper(aLatin1.lat
inline int QString::length() const
{ return d->size; }
inline const QChar QString::at(int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
+{
+ if (uint(i) >= uint(size())) return QChar();
+ return QChar(d->data()[i]);
+}
inline const QChar QString::operator[](int i) const
-{ Q_ASSERT(uint(i) < uint(size())); return QChar(d->data()[i]); }
+{
+ if (uint(i) >= uint(size())) return QChar();
+ return QChar(d->data()[i]);
+}
inline const QChar QString::operator[](uint i) const
-{ Q_ASSERT(i < uint(size())); return QChar(d->data()[i]); }
+{
+ if (i >= uint(size())) return QChar();
+ return QChar(d->data()[i]);
+}
inline bool QString::isEmpty() const
{ return d->size == 0; }
inline const QChar *QString::unicode() const