From nobody Sun Jan 02 09:52:31 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id C293C1922981; Sun, 2 Jan 2022 09:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JRZ1D1SXKz3rKj; Sun, 2 Jan 2022 09:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 124527CAB; Sun, 2 Jan 2022 09:52:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2029qVM1024441; Sun, 2 Jan 2022 09:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2029qVdQ024440; Sun, 2 Jan 2022 09:52:31 GMT (envelope-from git) Date: Sun, 2 Jan 2022 09:52:31 GMT Message-Id: <202201020952.2029qVdQ024440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Wojciech Macek Subject: git: bffefaf3e1ef - main - pmcstudy: fix error handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: wma X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bffefaf3e1ef55e52c6428961925f8224c0a20b2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641117152; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6s2jqBYszF3z6NJ1bUL0gAlfVcZpoh4DDnsNGvhq8tc=; b=V13YVCRacHSIUxCiprywovs0/KbJhKn0Q+FVbcNga3nZZSh8qhe3bKfe+PwaaU1bFuRO5F dZcVkSATRbsX6/VCWfRaSOsz14zHuJvK57f4BrItfrHj2bt6b/xVUskeEzsvJQE7UOf6zx 6uCc+h12sqgTpVPFvglqXU6RsdImZ26ffoGpFsqzYAOj9S5RPqH6/uHjtGWdLMVD9Gzsq6 tCazi6knYqPvuGly/o2xM6y4vapzuk/vUJmSRg1acluB5nKNu3nl/XiibvaI72sb0R8d0D fgod/C8yhqJn97RKbSZu3wnkThdyz0eLz9N8fhHecHVw6IaOdd9fzSJVN/ywZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641117152; a=rsa-sha256; cv=none; b=LXKqQSmM3nJAPyZef6vsChtaTapOYbKG8M33TGlhctOc/CVCAPpvOWlsfaDeapG9bhIATt EUVJaDJCTRpK7d4fANd5qqkJonsgv0YduHCUCmI7kjMYvW16TYfubIF+sEj9MiWby26eoj QQ+4V3xtyXayy0FuoljHLInAwOZjXvIWsETM26Sq5th20A6RbY6p+M2PIi3HhtDBndjNQh v5J7p+P6EY+z7n6bSIS3UkCVMHBmS71WvV3tnXadqx8VJdrTpV04atY7nLtVYQ2jsIM7/u I9cOg0IE1jaIcdJN6gi5kBruWsB+7s0SFtvjPb38Cp/zKHWQbR/e0e5usbht6g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by wma: URL: https://cgit.FreeBSD.org/src/commit/?id=bffefaf3e1ef55e52c6428961925f8224c0a20b2 commit bffefaf3e1ef55e52c6428961925f8224c0a20b2 Author: sebastien.bini AuthorDate: 2021-12-14 10:42:17 +0000 Commit: Wojciech Macek CommitDate: 2022-01-02 09:51:07 +0000 pmcstudy: fix error handling Close file descriptor in the correct way if no counters are built into the application. Obtained from: Stormshield --- usr.sbin/pmcstudy/pmcstudy.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/usr.sbin/pmcstudy/pmcstudy.c b/usr.sbin/pmcstudy/pmcstudy.c index 69d926a05e5d..6f5b6ba856a7 100644 --- a/usr.sbin/pmcstudy/pmcstudy.c +++ b/usr.sbin/pmcstudy/pmcstudy.c @@ -2249,6 +2249,10 @@ process_file(char *filename) if (filename == NULL) { io = my_popen(command, "r", &pid_of_command); + if (io == NULL) { + printf("Can't popen the command %s\n", command); + return; + } } else { io = fopen(filename, "r"); if (io == NULL) { @@ -2261,8 +2265,10 @@ process_file(char *filename) if (cnts == NULL) { /* Nothing we can do */ printf("Nothing to do -- no counters built\n"); - if (io) { + if (filename) { fclose(io); + } else { + my_pclose(io, pid_of_command); } return; }