From owner-dev-commits-ports-all@freebsd.org Thu Sep 9 20:03:02 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 EFE1E67644A; Thu, 9 Sep 2021 20:03:02 +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 4H590k6QvTz4V21; Thu, 9 Sep 2021 20:03:02 +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 BC3561FA23; Thu, 9 Sep 2021 20:03:02 +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 189K32WG084237; Thu, 9 Sep 2021 20:03:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 189K32Vs084236; Thu, 9 Sep 2021 20:03:02 GMT (envelope-from git) Date: Thu, 9 Sep 2021 20:03:02 GMT Message-Id: <202109092003.189K32Vs084236@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: 9e7bd94765c2 - main - ports-mgmt/dialog4ports: fix segfault MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e7bd94765c2ae7bc47d40abf56da5ae412f9f5f 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: Thu, 09 Sep 2021 20:03:03 -0000 The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e7bd94765c2ae7bc47d40abf56da5ae412f9f5f commit 9e7bd94765c2ae7bc47d40abf56da5ae412f9f5f Author: Dmitry Marakasov AuthorDate: 2021-09-09 19:56:11 +0000 Commit: Dmitry Marakasov CommitDate: 2021-09-09 20:02:40 +0000 ports-mgmt/dialog4ports: fix segfault Fix segfault when moving selection in some dialog configurations Reported by: gad, kumba@gentoo.org Submitted by: rum1cro@yandex.ru (maintainer) PR: 244204 --- ports-mgmt/dialog4ports/Makefile | 2 +- ports-mgmt/dialog4ports/files/patch-mixedlist.c | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/ports-mgmt/dialog4ports/Makefile b/ports-mgmt/dialog4ports/Makefile index 1838aeb1f7fc..ae095d534143 100644 --- a/ports-mgmt/dialog4ports/Makefile +++ b/ports-mgmt/dialog4ports/Makefile @@ -2,7 +2,7 @@ PORTNAME= dialog4ports PORTVERSION= 0.1.6 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= ports-mgmt MASTER_SITES= https://files.etoilebsd.net/dialog4ports/ \ http://mirror.shatow.net/freebsd/${PORTNAME}/ \ diff --git a/ports-mgmt/dialog4ports/files/patch-mixedlist.c b/ports-mgmt/dialog4ports/files/patch-mixedlist.c new file mode 100644 index 000000000000..80e8a6c1191b --- /dev/null +++ b/ports-mgmt/dialog4ports/files/patch-mixedlist.c @@ -0,0 +1,17 @@ +--- mixedlist.c_old 2021-01-03 16:01:52.851092000 +0300 ++++ mixedlist.c 2021-01-03 16:06:04.266150000 +0300 +@@ -652,12 +652,12 @@ + break; + case DLGK_ITEM_PREV: + i = choice - 1; ++ if (choice == 0 && scrollamt == 0) ++ continue; + if (items[scrollamt + i].type == ITEM_SEPARATOR && (scrollamt + i) == 0) + i++; + else if (items[scrollamt + i].type == ITEM_SEPARATOR) + i--; +- if (choice == 0 && scrollamt == 0) +- continue; + break; + case DLGK_ITEM_NEXT: + i = choice + 1;