From 5c3ad7d1a481a79f6052b9c6bbdedcae01d83b03 Mon Sep 17 00:00:00 2001 From: Debian Qt/KDE Maintainers Date: Sun, 14 Nov 2021 13:34:39 +0000 Subject: [PATCH] fix allocated memory of QByteArray returned by QIODevice::readLine Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=6485b6d45ad165cf Last-Update: 2021-02-20 Gbp-Pq: Name qiodevice_readline_memory.diff --- src/corelib/io/qiodevice.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/corelib/io/qiodevice.cpp b/src/corelib/io/qiodevice.cpp index cc1d11025..0f11c2e80 100644 --- a/src/corelib/io/qiodevice.cpp +++ b/src/corelib/io/qiodevice.cpp @@ -1480,10 +1480,12 @@ QByteArray QIODevice::readLine(qint64 maxSize) } else readBytes = readLine(result.data(), result.size()); - if (readBytes <= 0) + if (readBytes <= 0) { result.clear(); - else + } else { result.resize(readBytes); + result.squeeze(); + } return result; } -- 2.30.2