From owner-svn-src-all@freebsd.org Thu Jan 2 14:39:37 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 9DA9B1D1274; Thu, 2 Jan 2020 14:39:37 +0000 (UTC) (envelope-from markj@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47pVzs3jHlz4V0Y; Thu, 2 Jan 2020 14:39:37 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 7A3AC1CC92; Thu, 2 Jan 2020 14:39:37 +0000 (UTC) (envelope-from markj@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 002Edb2w024391; Thu, 2 Jan 2020 14:39:37 GMT (envelope-from markj@FreeBSD.org) Received: (from markj@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 002Edbd4024390; Thu, 2 Jan 2020 14:39:37 GMT (envelope-from markj@FreeBSD.org) Message-Id: <202001021439.002Edbd4024390@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: markj set sender to markj@FreeBSD.org using -f From: Mark Johnston Date: Thu, 2 Jan 2020 14:39:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r356272 - stable/12/usr.sbin/powerd X-SVN-Group: stable-12 X-SVN-Commit-Author: markj X-SVN-Commit-Paths: stable/12/usr.sbin/powerd X-SVN-Commit-Revision: 356272 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Jan 2020 14:39:37 -0000 Author: markj Date: Thu Jan 2 14:39:37 2020 New Revision: 356272 URL: https://svnweb.freebsd.org/changeset/base/356272 Log: MFC r356184: powerd(8): Fix a memory leak when we fail to read frequency levels. PR: 242967 Modified: stable/12/usr.sbin/powerd/powerd.c Directory Properties: stable/12/ (props changed) Modified: stable/12/usr.sbin/powerd/powerd.c ============================================================================== --- stable/12/usr.sbin/powerd/powerd.c Thu Jan 2 14:04:16 2020 (r356271) +++ stable/12/usr.sbin/powerd/powerd.c Thu Jan 2 14:39:37 2020 (r356272) @@ -196,8 +196,10 @@ read_freqs(int *numfreqs, int **freqs, int **power, in return (-1); if ((freqstr = malloc(len)) == NULL) return (-1); - if (sysctl(levels_mib, 4, freqstr, &len, NULL, 0)) + if (sysctl(levels_mib, 4, freqstr, &len, NULL, 0)) { + free(freqstr); return (-1); + } *numfreqs = 1; for (p = freqstr; *p != '\0'; p++)