From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB28F1382C5 for ; Thu, 7 Jan 2021 16:31:59 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A4D80E0843; Thu, 7 Jan 2021 16:31:58 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7EAC8E0843 for ; Thu, 7 Jan 2021 16:31:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4516B3413EB for ; Thu, 7 Jan 2021 16:31:57 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A04AD48E for ; Thu, 7 Jan 2021 16:31:55 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1610037035.04865eef221ea16b0ec3c2b92f0a549bc56a8dce.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-qt/qtcore/, dev-qt/qtcore/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch dev-qt/qtcore/qtcore-5.15.2-r2.ebuild X-VCS-Directories: dev-qt/qtcore/ dev-qt/qtcore/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 04865eef221ea16b0ec3c2b92f0a549bc56a8dce X-VCS-Branch: master Date: Thu, 7 Jan 2021 16:31:55 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b03de93c-9307-46fd-880b-49987ffdca82 X-Archives-Hash: c3b490c986b97251aaa55ed42c297cc9 commit: 04865eef221ea16b0ec3c2b92f0a549bc56a8dce Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 7 15:54:57 2021 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 7 16:30:35 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04865eef dev-qt/qtcore: Fix allocated memory of QByteArray ...returned by QIODevice::readLine. See also: https://bugreports.qt.io/browse/QTBUG-87010 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andreas Sturmlechner gentoo.org> ...qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch | 54 +++++++++++ dev-qt/qtcore/qtcore-5.15.2-r2.ebuild | 106 +++++++++++++++++++++ 2 files changed, 160 insertions(+) diff --git a/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch new file mode 100644 index 00000000000..892d89d2948 --- /dev/null +++ b/dev-qt/qtcore/files/qtcore-5.15.2-fix-alloc-mem-of-QByteArray.patch @@ -0,0 +1,54 @@ +From 6485b6d45ad165cf976138cf8ab683c42515e794 Mon Sep 17 00:00:00 2001 +From: Kai Koehne +Date: Tue, 13 Oct 2020 15:47:31 +0200 +Subject: [PATCH] Fix allocated memory of QByteArray returned by + QIODevice::readLine + +If the maxSize argument is 0 (the default), QIODevice::readLine will +allocate a QByteArray with the size of the next chunk of data, which +may be quite large. Before returning, it then resizes the byte array +to the actual size that was read. + +But since change 6b884d2aa129, QByteArray::resize() does no +longer shrink the capacity. This means that the returned QByteArray +keeps it's maximum size as allocated memory. This can lead to +excessive memory consumption, especially if the returned QByteArray's +are stored for further processing in the client code. + +Fix this by explicitly calling QByteArray::squeeze() before returning. + +[ChangeLog][QtCore][QIODevice] Fixes a regression in Qt 5.15 causing +QByteArray's that are returned by QIODevice::readLine() to +consume large amounts of memory. + +Fixes: QTBUG-87010 +Change-Id: I1f95fc4098849e900680fc945238bfeda881022c +Reviewed-by: Thiago Macieira +(cherry picked from commit 263b29eedb223dec1ecaee193302070af87a1852, +limited squeeze() call if bytes are actually read to preserve retVal.isNull() +behavior in 5.15) +--- + 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 cc1d1102522..0f11c2e805c 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.16.3 diff --git a/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild new file mode 100644 index 00000000000..3fce1aceac5 --- /dev/null +++ b/dev-qt/qtcore/qtcore-5.15.2-r2.ebuild @@ -0,0 +1,106 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +QT5_MODULE="qtbase" +inherit linux-info qt5-build + +DESCRIPTION="Cross-platform application development framework" +SLOT=5/$(ver_cut 1-3) + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" +fi + +IUSE="icu old-kernel systemd" + +DEPEND=" + dev-libs/double-conversion:= + dev-libs/glib:2 + dev-libs/libpcre2[pcre16,unicode] + sys-libs/zlib:= + icu? ( dev-libs/icu:= ) + !icu? ( virtual/libiconv ) + systemd? ( sys-apps/systemd:= ) +" +RDEPEND="${DEPEND} + !> "${D}"/${QT5_HEADERDIR}/QtCore/qconfig.h <<- _EOF_ || die + + #if defined(QT_NO_${flag}) && defined(QT_${flag}) + # undef QT_NO_${flag} + #elif !defined(QT_NO_${flag}) && !defined(QT_${flag}) + # define QT_NO_${flag} + #endif + _EOF_ + done +}