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
freebsd · Sep 9, 2021 · 9e7bd94 · 9e7bd94
1 parent 8eb9c34
commit 9e7bd94
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git 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
@@ -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;