From owner-dev-commits-ports-all@freebsd.org Tue Jul 13 17:15:31 2021 Return-Path: Delivered-To: dev-commits-ports-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 0BE59661D57; Tue, 13 Jul 2021 17:15:31 +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 4GPS2B6c5Jz4TT6; Tue, 13 Jul 2021 17:15:30 +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 C6DAE26039; Tue, 13 Jul 2021 17:15:30 +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 16DHFU6u057712; Tue, 13 Jul 2021 17:15:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16DHFUgk057711; Tue, 13 Jul 2021 17:15:30 GMT (envelope-from git) Date: Tue, 13 Jul 2021 17:15:30 GMT Message-Id: <202107131715.16DHFUgk057711@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 523c21a6ec64 - main - net/openmdns: amend the previous fix (add two more missing free() calls). MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 523c21a6ec6468b29cf704f7bc3bfb26aaf3e0e0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 Jul 2021 17:15:31 -0000 The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=523c21a6ec6468b29cf704f7bc3bfb26aaf3e0e0 commit 523c21a6ec6468b29cf704f7bc3bfb26aaf3e0e0 Author: Alexey Dokuchaev AuthorDate: 2021-07-13 17:12:08 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-07-13 17:12:20 +0000 net/openmdns: amend the previous fix (add two more missing free() calls). PR: 249296 --- net/openmdns/files/patch-mdnsd_mdns.c | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/net/openmdns/files/patch-mdnsd_mdns.c b/net/openmdns/files/patch-mdnsd_mdns.c index 319ad7069259..a01c1ab456cd 100644 --- a/net/openmdns/files/patch-mdnsd_mdns.c +++ b/net/openmdns/files/patch-mdnsd_mdns.c @@ -21,7 +21,23 @@ return (0); } /* -@@ -186,14 +191,17 @@ cache_process(struct rr *rr) +@@ -167,6 +172,7 @@ cache_process(struct rr *rr) + log_warnx("cache_process: conflict for %s", + rrs_str(&rr->rrs)); + conflict_resolve_by_rr(rr_aux); ++ free(rr); + return (-1); + } + } +@@ -178,6 +184,7 @@ cache_process(struct rr *rr) + log_warnx("cache_process: goodbye %s", + rrs_str(&rr->rrs)); + cache_delete(rr_aux); ++ free(rr); + return (0); + } + /* Cache refresh */ +@@ -186,14 +193,17 @@ cache_process(struct rr *rr) rr_aux->ttl = rr->ttl; rr_aux->revision = 0; cache_schedrev(rr_aux);