Attachment #251462 for bug #277041

Lines 1-6 Link Here

(-)b/sysutils/tmux/Makefile (-2 / +1 lines)
1	PORTNAME= tmux	1	PORTNAME= tmux
2	PORTVERSION= 3.3a	2	PORTVERSION= 3.4
3	PORTREVISION= 3
4	CATEGORIES= sysutils	3	CATEGORIES= sysutils
5	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/	4	MASTER_SITES= https://github.com/tmux/tmux/releases/download/${PORTVERSION}/
6	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}	5	DISTFILES= ${DISTNAME}${EXTRACT_SUFX}

Lines 1-5 Link Here

(-)b/sysutils/tmux/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1657892731	1	TIMESTAMP = 1707870623
2	SHA256 (tmux-3.3a.tar.gz) = e4fd347843bd0772c4f48d6dde625b0b109b7a380ff15db21e97c11a4dcdf93f	2	SHA256 (tmux-3.4.tar.gz) = 551ab8dea0bf505c0ad6b7bb35ef567cdde0ccb84357df142c254f35a23e19aa
3	SIZE (tmux-3.3a.tar.gz) = 677448	3	SIZE (tmux-3.4.tar.gz) = 707213
4	SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626	4	SHA256 (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 4e4f791c446e3cab1a02d39a30fbfd4cec6c7e3119365860a04c9de205eaa626
5	SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726	5	SIZE (imomaliev-tmux-bash-completion-f5d5323_GH0.tar.gz) = 8726




Index: control.c
===================================================================
--- control.c.orig	2022-04-25 08:25:13 UTC
+++ control.c
@@ -775,6 +775,9 @@ control_start(struct client *c)
 
 	cs->read_event = bufferevent_new(c->fd, control_read_callback,
 	    control_write_callback, control_error_callback, c);
+	if (cs->read_event == NULL)
+		fatalx("out of memory");
+
 	bufferevent_enable(cs->read_event, EV_READ);
 
 	if (c->flags & CLIENT_CONTROLCONTROL)
@@ -782,6 +785,8 @@ control_start(struct client *c)
 	else {
 		cs->write_event = bufferevent_new(c->out_fd, NULL,
 		    control_write_callback, control_error_callback, c);
+		if (cs->write_event == NULL)
+			fatalx("out of memory");
 	}
 	bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW,
 	    0);
--- file.c.orig	2022-04-25 08:25:13 UTC
+++ file.c
@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmu
 
 	cf->event = bufferevent_new(cf->fd, NULL, file_write_callback,
 	    file_write_error_callback, cf);
+	if (cf->event == NULL)
+		fatalx("out of memory");
 	bufferevent_enable(cf->event, EV_WRITE);
 	goto reply;
 
@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmux
 
 	cf->event = bufferevent_new(cf->fd, file_read_callback, NULL,
 	    file_read_error_callback, cf);
+	if (cf->event == NULL)
+		fatalx("out of memory");
 	bufferevent_enable(cf->event, EV_READ);
 	return;
 
--- window.c.orig	2022-04-25 08:25:14 UTC
+++ window.c
@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp)
 
 	wp->event = bufferevent_new(wp->fd, window_pane_read_callback,
 	    NULL, window_pane_error_callback, wp);
+	if (wp->event == NULL)
+		fatalx("out of memory");
 	wp->ictx = input_init(wp, wp->event, &wp->palette);
 
 	bufferevent_enable(wp->event, EV_READ|EV_WRITE);




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 277041

Removed Link Here

(-)a/sysutils/tmux/files/patch-e86752820993a0 (-54 lines)
1	Index: control.c
2	===================================================================
3	--- control.c.orig 2022-04-25 08:25:13 UTC
4	+++ control.c
5	@@ -775,6 +775,9 @@ control_start(struct client *c)
6
7	cs->read_event = bufferevent_new(c->fd, control_read_callback,
8	control_write_callback, control_error_callback, c);
9	+ if (cs->read_event == NULL)
10	+ fatalx("out of memory");
11	+
12	bufferevent_enable(cs->read_event, EV_READ);
13
14	if (c->flags & CLIENT_CONTROLCONTROL)
15	@@ -782,6 +785,8 @@ control_start(struct client *c)
16	else {
17	cs->write_event = bufferevent_new(c->out_fd, NULL,
18	control_write_callback, control_error_callback, c);
19	+ if (cs->write_event == NULL)
20	+ fatalx("out of memory");
21	}
22	bufferevent_setwatermark(cs->write_event, EV_WRITE, CONTROL_BUFFER_LOW,
23	0);
24	--- file.c.orig 2022-04-25 08:25:13 UTC
25	+++ file.c
26	@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmu
27
28	cf->event = bufferevent_new(cf->fd, NULL, file_write_callback,
29	file_write_error_callback, cf);
30	+ if (cf->event == NULL)
31	+ fatalx("out of memory");
32	bufferevent_enable(cf->event, EV_WRITE);
33	goto reply;
34
35	@@ -744,6 +746,8 @@ file_read_open(struct client_files *files, struct tmux
36
37	cf->event = bufferevent_new(cf->fd, file_read_callback, NULL,
38	file_read_error_callback, cf);
39	+ if (cf->event == NULL)
40	+ fatalx("out of memory");
41	bufferevent_enable(cf->event, EV_READ);
42	return;
43
44	--- window.c.orig 2022-04-25 08:25:14 UTC
45	+++ window.c
46	@@ -1042,6 +1042,8 @@ window_pane_set_event(struct window_pane *wp)
47
48	wp->event = bufferevent_new(wp->fd, window_pane_read_callback,
49	NULL, window_pane_error_callback, wp);
50	+ if (wp->event == NULL)
51	+ fatalx("out of memory");
52	wp->ictx = input_init(wp, wp->event, &wp->palette);
53
54	bufferevent_enable(wp->event, EV_READ\|EV_WRITE);

Removed Link Here

(-)a/sysutils/tmux/files/patch-to-fix-crash-due-to-change-to-ncurses.patch (-64 lines)
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
64	-