Hello community,
here is the log from the commit of package tmux for openSUSE:Factory checked in
at 2018-06-19 12:04:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/tmux (Old)
and /work/SRC/openSUSE:Factory/.tmux.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "tmux"
Tue Jun 19 12:04:23 2018 rev:40 rq:617320 version:2.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/tmux/tmux.changes 2018-05-16
11:44:11.690618177 +0200
+++ /work/SRC/openSUSE:Factory/.tmux.new/tmux.changes 2018-06-19
12:04:25.456337227 +0200
@@ -1,0 +2,7 @@
+Fri Jun 15 10:06:14 UTC 2018 - barendartc...@suse.com
+
+- Add upstream
+ 0001-Increment-the-lines-counter-when-skipping-a-line-to-.patch fixing
+ infinite loop when resizing the window
+
+-------------------------------------------------------------------
New:
----
0001-Increment-the-lines-counter-when-skipping-a-line-to-.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ tmux.spec ++++++
--- /var/tmp/diff_new_pack.XqI9dL/_old 2018-06-19 12:04:26.116312723 +0200
+++ /var/tmp/diff_new_pack.XqI9dL/_new 2018-06-19 12:04:26.120312574 +0200
@@ -27,6 +27,8 @@
Source1: bash_completion_tmux.sh
# PATCH-FIX-OPENSUSE crrodrig...@opensuse.org -- Use /run/tmux instead of /tmp
as the default socket path, this add some robustness against accidental
deletion via systemd-tmpfiles-clean, tmpwatch, or similar
Patch0: tmux-socket-path.patch
+# PATCH-FIX-UPSTREAM barendartc...@suse.com -- This fixes an infinite loop
when resizing window
+Patch1: 0001-Increment-the-lines-counter-when-skipping-a-line-to-.patch
BuildRequires: pkgconfig
BuildRequires: utempter-devel
BuildRequires: pkgconfig(libevent) >= 2.0
@@ -53,6 +55,7 @@
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
export CFLAGS="%{optflags} -fno-strict-aliasing"
++++++ 0001-Increment-the-lines-counter-when-skipping-a-line-to-.patch ++++++
>From ba31d3a88c8c76ec3c76d9a91373fa24e64797cd Mon Sep 17 00:00:00 2001
From: nicm <nicm>
Date: Sun, 3 Jun 2018 10:17:30 +0000
Subject: [PATCH] Increment the lines counter when skipping a line to avoid an
infinite loop, and fix a check to avoid a potential out-of-bounds access.
Problem reported by Yuxiang Qin and tracked down by Karl Beldan; GitHub issue
1352.
Also a man page fix request by jmc@.
---
grid.c | 3 ++-
tmux.1 | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/grid.c b/grid.c
index f1facc4c..c88a451b 100644
--- a/grid.c
+++ b/grid.c
@@ -1011,7 +1011,7 @@ grid_reflow_join(struct grid *target, struct grid *gd,
u_int sx, u_int yy,
* If this is now the last line, there is nothing more to be
* done.
*/
- if (yy + lines == gd->hsize + gd->sy)
+ if (yy + 1 + lines == gd->hsize + gd->sy)
break;
line = yy + 1 + lines;
@@ -1021,6 +1021,7 @@ grid_reflow_join(struct grid *target, struct grid *gd,
u_int sx, u_int yy,
if (gd->linedata[line].cellused == 0) {
if (!wrapped)
break;
+ lines++;
continue;
}
