Compare commits

...

12 Commits

Author SHA1 Message Date
openeuler-ci-bot
341ed3bb29
!21 [sync] PR-20: fix CVE-2022-47016
From: @openeuler-sync-bot 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2023-02-07 07:15:41 +00:00
zhouwenpei
47bd4b1c0c fix CVE-2022-47016
(cherry picked from commit 29a80ab563e55b0e6f5680c625f546ef139e9953)
2023-02-06 19:13:39 +08:00
openeuler-ci-bot
cd36fa946d
!17 【轻量级 PR】:Rebuild for next release
From: @zhouwenpei 
Reviewed-by: @t_feng 
Signed-off-by: @t_feng
2022-10-26 12:11:32 +00:00
zhouwenpei
ba2b156c1d
Rebuild for next release
Signed-off-by: zhouwenpei <zhouwenpei050@chinasoftinc.com>
2022-10-26 07:46:50 +00:00
openeuler-ci-bot
ec0f842374 !13 upgrade to 3.2a
Merge pull request !13 from yangcheng1203/master
2021-12-14 08:16:19 +00:00
yangcheng1203
8c5b209c64 Upgrade to 3.2a 2021-12-03 11:33:16 +08:00
openeuler-ci-bot
b0ca3059c3 !8 fix CVE
From: @yeah_wang
Reviewed-by: @orange-snn
Signed-off-by: @orange-snn
2020-11-28 16:36:56 +08:00
jinzhimin369
7b47e17429 fix CVE 2020-11-28 15:57:50 +08:00
openeuler-ci-bot
c4ffa83577 !2 add yaml file in package
Merge pull request !2 from gaoch_100/master
2020-06-23 16:46:24 +08:00
openeuler-ci-bot
eb149b5b23 !5 update release to 3.1
Merge pull request !5 from tianwei/master
2020-06-20 21:48:53 +08:00
weiwei_150212
1722130225 update to release 3.1 2020-06-20 21:07:11 +08:00
gaochao_100
ea6ca1c3c8 add yaml file in package 2020-06-17 10:48:25 +08:00
5 changed files with 93 additions and 3 deletions

View File

@ -0,0 +1,70 @@
From e86752820993a00e3d28350cbe46878ba95d9012 Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Wed, 24 Aug 2022 07:22:30 +0000
Subject: [PATCH] Check for NULL returns from bufferevent_new.
---
control.c | 4 ++++
file.c | 4 ++++
window.c | 2 ++
3 files changed, 10 insertions(+)
diff --git a/control.c b/control.c
index 7a5b9eb..b4f22db 100644
--- a/control.c
+++ b/control.c
@@ -775,6 +775,8 @@ 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 +784,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);
diff --git a/file.c b/file.c
index 974c8a3..0716b98 100644
--- a/file.c
+++ b/file.c
@@ -585,6 +585,8 @@ file_write_open(struct client_files *files, struct tmuxpeer *peer,
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 tmuxpeer *peer,
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;
diff --git a/window.c b/window.c
index f21a4d5..7f99e66 100644
--- a/window.c
+++ b/window.c
@@ -978,6 +978,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);
bufferevent_enable(wp->event, EV_READ|EV_WRITE);
--
2.33.0

Binary file not shown.

BIN
tmux-3.2a.tar.gz Normal file

Binary file not shown.

View File

@ -1,8 +1,8 @@
%global _hardened_build 1
Name: tmux
Version: 2.9a
Release: 1
Version: 3.2a
Release: 3
Summary: A terminal multiplexer
License: ISC and BSD
@ -10,6 +10,8 @@ URL: https://tmux.github.io/
Source0: https://github.com/%{name}/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
Source1: bash_completion_tmux.sh
Patch6000: backport-CVE-2022-47016.patch
BuildRequires: gcc libevent-devel ncurses-devel libutempter-devel
%description
@ -59,9 +61,23 @@ fi
%files help
%defattr(-,root,root)
%doc CHANGES TODO
%{_mandir}/man1/%{name}.1.gz
%changelog
* Sat Feb 04 2023 zhouwenpei <zhouwenpei1@h-partners.com> - 3.2a-3
- fix CVE-2022-47016
* Wed Oct 26 2022 zhouwenpei <zhouwenpei1@h-partners.com> - 3.2a-2
- Rebuild for next release
* Fri Dec 3 2021 yangcheng <yangcheng87@huawei.com> - 3.2a-1
- DESC:upgrade to 3.2a
* Sat Nov 28 2020 wangye <wangye70@huawei.com> - 3.1-2
- DESC:fix CVE
* Sat Jun 20 2020 weiwei_150212 <tianwei12@huawei.com> - 3.1-1
- DESC:update to release 3.1
* Fri Oct 11 2019 openEuler Buildteam <buildteam@openeuler.org> - 2.9a-1
- Package init

4
tmux.yaml Normal file
View File

@ -0,0 +1,4 @@
version_control: github
src_repo: tmux/tmux
tag_prefix: "^v"
seperator: "."