From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1142356-garchives=archives.gentoo.org@lists.gentoo.org> 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 C21B8138350 for <garchives@archives.gentoo.org>; Mon, 3 Feb 2020 13:17:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E03EFE0869; Mon, 3 Feb 2020 13:17:05 +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 C5EDEE0869 for <gentoo-commits@lists.gentoo.org>; Mon, 3 Feb 2020 13:17:05 +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 CA5B634E61E for <gentoo-commits@lists.gentoo.org>; Mon, 3 Feb 2020 13:17:03 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4739935 for <gentoo-commits@lists.gentoo.org>; Mon, 3 Feb 2020 13:17:02 +0000 (UTC) From: "Fabian Groffen" <grobian@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" <grobian@gentoo.org> Message-ID: <1580735748.38bb361b2a8ed4bcf9b6f9ee3eb48ccd815bb382.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 38bb361b2a8ed4bcf9b6f9ee3eb48ccd815bb382 X-VCS-Branch: master Date: Mon, 3 Feb 2020 13:17:02 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6b57c3fb-c9ea-46ac-b171-5e3628018dad X-Archives-Hash: 911caeb15feae3a681e9ece51045c1c1 commit: 38bb361b2a8ed4bcf9b6f9ee3eb48ccd815bb382 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> AuthorDate: Mon Feb 3 13:15:48 2020 +0000 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> CommitDate: Mon Feb 3 13:15:48 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=38bb361b libq/tree: be more conservative with mem-clearing Previous fix cleared unnecessary amounts of memory (immediately overwritten by fread()), use a memset on the area of memory required. Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> libq/tree.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/libq/tree.c b/libq/tree.c index 8424459..1c2a54e 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -689,8 +689,9 @@ tree_read_file_md5(tree_pkg_ctx *pkg_ctx) goto err; len = sizeof(*ret) + s.st_size + 1; - ret = xzalloc(len); - ptr = (char*)ret + sizeof(*ret); + ret = xmalloc(len); + memset(ret, 0, sizeof(*ret)); + ptr = (char *)ret + sizeof(*ret); if ((off_t)fread(ptr, 1, s.st_size, f) != s.st_size) goto err; ptr[s.st_size] = '\0'; @@ -802,7 +803,8 @@ tree_read_file_ebuild(tree_pkg_ctx *pkg_ctx) goto err; len = sizeof(*ret) + s.st_size + 1; - ret = xzalloc(len); + ret = xmalloc(len); + memset(ret, 0, sizeof(*ret)); p = (char *)ret + sizeof(*ret); if ((off_t)fread(p, 1, s.st_size, f) != s.st_size) goto err;