From a457e9245173621c8c718611d1515e24803aabe5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Sun, 9 Jan 2022 06:13:13 -0800 Subject: QByteArray: fix append() with a negative length The documentation says that if it's negative, we find the null termination. This bug was introduced with the clean up to use QByteArrayView in commit 8897aa071a668563a53a4c2e6909572f1762b1e7. Fixes: QTBUG-99640 Change-Id: Ib42b3adc93bf4d43bd55fffd16c89fa4a960f3a9 Reviewed-by: Friedemann Kleint Reviewed-by: Marc Mutz (cherry picked from commit bb35b2f64dfa18c491aed8b8103941325df3228b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/text/qbytearray.h | 4 ++-- tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h index 3c143d7932..6abd15f6fc 100644 --- a/src/corelib/text/qbytearray.h +++ b/src/corelib/text/qbytearray.h @@ -249,9 +249,9 @@ public: QByteArray &append(char c); inline QByteArray &append(qsizetype count, char c); QByteArray &append(const char *s) - { return append(QByteArrayView(s, qsizetype(qstrlen(s)))); } + { return append(s, -1); } QByteArray &append(const char *s, qsizetype len) - { return append(QByteArrayView(s, len)); } + { return append(QByteArrayView(s, len < 0 ? qsizetype(qstrlen(s)) : len)); } QByteArray &append(const QByteArray &a); QByteArray &append(QByteArrayView a) { return insert(size(), a); } diff --git a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp index 05116f99c9..073bb2dc08 100644 --- a/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp +++ b/tests/auto/corelib/text/qbytearray/tst_qbytearray.cpp @@ -958,6 +958,7 @@ void tst_QByteArray::append() QCOMPARE(QByteArray().append(2, 'a'), QByteArray("aa")); QCOMPARE(QByteArray().append(QByteArray("data")), QByteArray("data")); QCOMPARE(QByteArray().append(data), QByteArray("data")); + QCOMPARE(QByteArray().append(data, -1), QByteArray("data")); QCOMPARE(QByteArray().append(data, 2), QByteArray("da")); QCOMPARE(QByteArray().append(QByteArrayView(data)), QByteArray("data")); -- cgit v1.2.3