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 858231382C5 for ; Tue, 20 Feb 2018 20:39:23 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A1E72E0904; Tue, 20 Feb 2018 20:39:22 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 6C643E0904 for ; Tue, 20 Feb 2018 20:39:22 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 338F5335C2A for ; Tue, 20 Feb 2018 20:39:21 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 20CFB1DF for ; Tue, 20 Feb 2018 20:39:17 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1519159135.8f1bc6d821167d87e21034d108e899e0b5cd14f2.whissi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-libs/librdkafka/files/, dev-libs/librdkafka/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild dev-libs/librdkafka/librdkafka-0.11.3.ebuild X-VCS-Directories: dev-libs/librdkafka/files/ dev-libs/librdkafka/ X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 8f1bc6d821167d87e21034d108e899e0b5cd14f2 X-VCS-Branch: master Date: Tue, 20 Feb 2018 20:39:17 +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-Archives-Salt: e12a6287-4872-466e-a219-8aaee6558769 X-Archives-Hash: 993160d01cffdbcb4407f44a65b415a5 commit: 8f1bc6d821167d87e21034d108e899e0b5cd14f2 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Feb 20 18:40:49 2018 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Feb 20 20:38:55 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f1bc6d8 dev-libs/librdkafka: Rev bump to address memory leak Package-Manager: Portage-2.3.24, Repoman-2.3.6 RepoMan-Options: --force .../librdkafka-0.11.3-fix-memory-leak-issue1534.patch | 19 +++++++++++++++++++ ...afka-0.11.3.ebuild => librdkafka-0.11.3-r1.ebuild} | 2 ++ 2 files changed, 21 insertions(+) diff --git a/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch new file mode 100644 index 00000000000..ae4c3e5bc81 --- /dev/null +++ b/dev-libs/librdkafka/files/librdkafka-0.11.3-fix-memory-leak-issue1534.patch @@ -0,0 +1,19 @@ +https://github.com/edenhill/librdkafka/commit/8fed971043e642c195860cd77006622d23616c22 + +--- a/src/rdkafka_msgset_writer.c ++++ b/src/rdkafka_msgset_writer.c +@@ -436,10 +436,12 @@ rd_kafka_msgset_writer_write_msg_payload (rd_kafka_msgset_writer_t *msetw, + * room in the buffer we'll copy the payload to the buffer, + * otherwise we push a reference to the memory. */ + if (rkm->rkm_len <= (size_t)rk->rk_conf.msg_copy_max_size && +- rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) ++ rd_buf_write_remains(&rkbuf->rkbuf_buf) > rkm->rkm_len) { + rd_kafka_buf_write(rkbuf, + rkm->rkm_payload, rkm->rkm_len); +- else ++ if (free_cb) ++ free_cb(rkm->rkm_payload); ++ } else + rd_kafka_buf_push(rkbuf, rkm->rkm_payload, rkm->rkm_len, + free_cb); + } diff --git a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild similarity index 95% rename from dev-libs/librdkafka/librdkafka-0.11.3.ebuild rename to dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild index 00872b0eadc..f7ec851be53 100644 --- a/dev-libs/librdkafka/librdkafka-0.11.3.ebuild +++ b/dev-libs/librdkafka/librdkafka-0.11.3-r1.ebuild @@ -15,6 +15,8 @@ if [[ ${PV} == "9999" ]]; then else SRC_URI="https://github.com/edenhill/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc x86" + + PATCHES=( "${FILESDIR}"/${P}-fix-memory-leak-issue1534.patch ) fi LICENSE="BSD-2"