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 38AF5138350 for ; Sat, 25 Jan 2020 10:02:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48EBFE082D; Sat, 25 Jan 2020 10:02:00 +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 2949AE082D for ; Sat, 25 Jan 2020 10:01:59 +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 95CBC34E29E for ; Sat, 25 Jan 2020 10:01:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 98FE8101 for ; Sat, 25 Jan 2020 10:01:56 +0000 (UTC) From: "Fabian Groffen" 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" Message-ID: <1579946463.adedae3b3673d3797ba2ba381acf04c24c38b309.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qpkg.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: adedae3b3673d3797ba2ba381acf04c24c38b309 X-VCS-Branch: master Date: Sat, 25 Jan 2020 10:01:56 +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: 541fe065-a474-4c18-aa2c-436410335148 X-Archives-Hash: 4004c1692ef83b51e1e23319d708be1b commit: adedae3b3673d3797ba2ba381acf04c24c38b309 Author: Fabian Groffen gentoo org> AuthorDate: Sat Jan 25 10:01:03 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat Jan 25 10:01:03 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=adedae3b qpkg: try 2 at Coverity 206549 Time of check time of use Signed-off-by: Fabian Groffen gentoo.org> qpkg.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/qpkg.c b/qpkg.c index 6aa5f76..3602acf 100644 --- a/qpkg.c +++ b/qpkg.c @@ -257,9 +257,16 @@ qpkg_make(depend_atom *atom) } pclose(fp); + if ((i = open(tbz2, O_WRONLY)) < 0) { + warnp("failed to open '%s': %s", tbz2, strerror(errno)); + free(buf); + return 1; + } + /* get offset where xpak will start */ - if (stat(tbz2, &st) == -1) { + if (fstat(i, &st) == -1) { warnp("could not stat '%s': %s", tbz2, strerror(errno)); + close(i); free(buf); return 1; } @@ -271,12 +278,6 @@ qpkg_make(depend_atom *atom) xpak_argv[1] = NULL; xpak_create(AT_FDCWD, tbz2, 1, xpak_argv, 1, verbose); - if ((i = open(tbz2, O_WRONLY | O_APPEND)) < 0) { - warnp("failed to open '%s': %s", tbz2, strerror(errno)); - free(buf); - return 1; - } - /* calculate the number of bytes taken by the xpak archive */ if (fstat(i, &st) == -1) { warnp("could not stat '%s': %s", tbz2, strerror(errno));