Attachment #250928 for bug #279276

View | Details | Raw Unified | Return to bug 279276
Collapse All | Expand All

Lines 1-6 Link Here

(-)b/sysutils/tmux/Makefile (-2 / +2 lines)
1	PORTNAME= tmux	1	PORTNAME= tmux
2	PORTVERSION= 3.3a	2	PORTVERSION= 3.3a
3	PORTREVISION= 2	3	PORTREVISION= 3
4	CATEGORIES= sysutils	4	CATEGORIES= sysutils
5	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/	5	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
Lines 16-22 LICENSE_FILE_GPLv2= ${WRKSRC_bash}/COPYING Link Here
16	LICENSE_DISTFILES_ISCL= ${DISTNAME}${EXTRACT_SUFX}	16	LICENSE_DISTFILES_ISCL= ${DISTNAME}${EXTRACT_SUFX}
17	LICENSE_DISTFILES_GPLv2= ${DISTFILE_bash}	17	LICENSE_DISTFILES_GPLv2= ${DISTFILE_bash}
18		18
19	USES= cpe ncurses pkgconfig	19	USES= cpe ncurses:port pkgconfig
20		20
21	CPE_VENDOR= tmux_project	21	CPE_VENDOR= tmux_project
22		22




diff --git tty-term.c tty-term.c
index fdf0c4fa..873e1ce2 100644
--- tty-term.c
+++ tty-term.c
@@ -762,33 +762,53 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
 const char *
 tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
 {
-	return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
+	const char	*x = tty_term_string(term, code), *s;
+	s = tiparm_s(1, 0, x, a);
+	if (s == NULL)
+		fatalx("could not expand %s", tty_term_codes[code].name);
+	return (s);
 }
 
 const char *
 tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
 {
-	return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
+	const char	*x = tty_term_string(term, code), *s;
+	s = tiparm_s(2, 0, x, a, b);
+	if (s == NULL)
+		fatalx("could not expand %s", tty_term_codes[code].name);
+	return (s);
 }
 
 const char *
 tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
     int c)
 {
-	return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0));
+	const char	*x = tty_term_string(term, code), *s;
+	s = tiparm_s(3, 0, x, a, b, c);
+	if (s == NULL)
+		fatalx("could not expand %s", tty_term_codes[code].name);
+	return (s);
 }
 
 const char *
 tty_term_ptr1(struct tty_term *term, enum tty_code_code code, const void *a)
 {
-	return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
+	const char	*x = tty_term_string(term, code), *s;
+	s = tiparm_s(1, 1, x, a);
+	if (s == NULL)
+		fatalx("could not expand %s", tty_term_codes[code].name);
+	return (s);
 }
 
 const char *
 tty_term_ptr2(struct tty_term *term, enum tty_code_code code, const void *a,
     const void *b)
 {
-	return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
+	const char	*x = tty_term_string(term, code), *s;
+	s = tiparm_s(2, 3, x, a, b);
+	if (s == NULL)
+		fatalx("could not expand %s", tty_term_codes[code].name);
+	return (s);
 }
 
 int

Return to bug 279276

Added Link Here

(-)b/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch (-1 / +63 lines)
0	-	1	diff --git tty-term.c tty-term.c
		2	index fdf0c4fa..873e1ce2 100644
		3	--- tty-term.c
		4	+++ tty-term.c
		5	@@ -762,33 +762,53 @@ tty_term_string(struct tty_term *term, enum tty_code_code code)
		6	const char *
		7	tty_term_string1(struct tty_term *term, enum tty_code_code code, int a)
		8	{
		9	- return (tparm((char *) tty_term_string(term, code), a, 0, 0, 0, 0, 0, 0, 0, 0));
		10	+ const char x = tty_term_string(term, code), s;
		11	+ s = tiparm_s(1, 0, x, a);
		12	+ if (s == NULL)
		13	+ fatalx("could not expand %s", tty_term_codes[code].name);
		14	+ return (s);
		15	}
		16
		17	const char *
		18	tty_term_string2(struct tty_term *term, enum tty_code_code code, int a, int b)
		19	{
		20	- return (tparm((char *) tty_term_string(term, code), a, b, 0, 0, 0, 0, 0, 0, 0));
		21	+ const char x = tty_term_string(term, code), s;
		22	+ s = tiparm_s(2, 0, x, a, b);
		23	+ if (s == NULL)
		24	+ fatalx("could not expand %s", tty_term_codes[code].name);
		25	+ return (s);
		26	}
		27
		28	const char *
		29	tty_term_string3(struct tty_term *term, enum tty_code_code code, int a, int b,
		30	int c)
		31	{
		32	- return (tparm((char *) tty_term_string(term, code), a, b, c, 0, 0, 0, 0, 0, 0));
		33	+ const char x = tty_term_string(term, code), s;
		34	+ s = tiparm_s(3, 0, x, a, b, c);
		35	+ if (s == NULL)
		36	+ fatalx("could not expand %s", tty_term_codes[code].name);
		37	+ return (s);
		38	}
		39
		40	const char *
		41	tty_term_ptr1(struct tty_term term, enum tty_code_code code, const void a)
		42	{
		43	- return (tparm((char *) tty_term_string(term, code), (long)a, 0, 0, 0, 0, 0, 0, 0, 0));
		44	+ const char x = tty_term_string(term, code), s;
		45	+ s = tiparm_s(1, 1, x, a);
		46	+ if (s == NULL)
		47	+ fatalx("could not expand %s", tty_term_codes[code].name);
		48	+ return (s);
		49	}
		50
		51	const char *
		52	tty_term_ptr2(struct tty_term term, enum tty_code_code code, const void a,
		53	const void *b)
		54	{
		55	- return (tparm((char *) tty_term_string(term, code), (long)a, (long)b, 0, 0, 0, 0, 0, 0, 0));
		56	+ const char x = tty_term_string(term, code), s;
		57	+ s = tiparm_s(2, 3, x, a, b);
		58	+ if (s == NULL)
		59	+ fatalx("could not expand %s", tty_term_codes[code].name);
		60	+ return (s);
		61	}
		62
		63	int