diff options
Diffstat (limited to 'src/corelib/text/qtextboundaryfinder.cpp')
| -rw-r--r-- | src/corelib/text/qtextboundaryfinder.cpp | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/text/qtextboundaryfinder.cpp b/src/corelib/text/qtextboundaryfinder.cpp index e387df3f8d..21d4c5153e 100644 --- a/src/corelib/text/qtextboundaryfinder.cpp +++ b/src/corelib/text/qtextboundaryfinder.cpp @@ -20,7 +20,7 @@ static void init(QTextBoundaryFinder::BoundaryType type, QStringView str, QCharA case QTextBoundaryFinder::Line: options |= QUnicodeTools::LineBreaks; break; default: break; } - QUnicodeTools::initCharAttributes(str, scriptItems.data(), scriptItems.count(), attributes, options); + QUnicodeTools::initCharAttributes(str, scriptItems.data(), scriptItems.size(), attributes, options); } /*! @@ -173,9 +173,7 @@ QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QString &strin : t(type) , s(string) , sv(s) - , pos(0) , freeBuffer(true) - , attributes(nullptr) { if (sv.size() > 0) { attributes = (QCharAttributes *) malloc((sv.size() + 1) * sizeof(QCharAttributes)); @@ -208,12 +206,10 @@ QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, const QString &strin QTextBoundaryFinder::QTextBoundaryFinder(BoundaryType type, QStringView string, unsigned char *buffer, qsizetype bufferSize) : t(type) , sv(string) - , pos(0) , freeBuffer(true) - , attributes(nullptr) { if (!sv.isEmpty()) { - if (buffer && (uint)bufferSize >= (sv.size() + 1) * sizeof(QCharAttributes)) { + if (buffer && bufferSize / int(sizeof(QCharAttributes)) >= sv.size() + 1) { attributes = reinterpret_cast<QCharAttributes *>(buffer); freeBuffer = false; } else { |