[rxvt-unicode] 9.12-2 fix segfault (rhbz#711137)

[Andreas Bierfert]

commit 715e5c086cd86ab23bb2085441031ab4e8476346
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Wed Jul 6 08:14:26 2011 +0200

    9.12-2
    fix segfault (rhbz#711137)

 rxvt-unicode-screen.patch |   24 ++++++++++++++++++++++++
 rxvt-unicode.spec         |   12 +++++++++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/rxvt-unicode-screen.patch b/rxvt-unicode-screen.patch
new file mode 100644
index 0000000..369667e
--- /dev/null
+++ b/rxvt-unicode-screen.patch
@@ -0,0 +1,24 @@
+--- screen.C	2011/05/30 18:39:04	1.384
++++ screen.C	2011/07/06 00:40:10	1.385
+@@ -633,6 +633,10 @@
+   if (count == 0 || (row1 > row2))
+     return 0;
+ 
++  int rows = row2 - row1 + 1;
++
++  min_it (count, rows);
++
+   want_refresh = 1;
+   num_scr += count;
+ 
+@@ -734,10 +738,6 @@
+       // use a simple and robust scrolling algorithm, this
+       // part of scr_scroll_text is not time-critical.
+ 
+-      int rows = row2 - row1 + 1;
+-
+-      min_it (count, rows);
+-
+       line_t *temp_buf = row_buf + total_rows;
+ 
+       for (int row = 0; row < rows; row++)
diff --git a/rxvt-unicode.spec b/rxvt-unicode.spec
index 8120c2f..4570e26 100644
--- a/rxvt-unicode.spec
+++ b/rxvt-unicode.spec
@@ -1,6 +1,6 @@
 Name:           rxvt-unicode
 Version:        9.12
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Unicode version of rxvt
 
 Group:          User Interface/X
@@ -13,6 +13,9 @@ Source3:        rxvt-unicode-256color.desktop
 Source4:        rxvt-unicode-256color-ml.desktop
 Patch0:         rxvt-unicode-scroll-modupdown.patch
 Patch1:         rxvt-unicode-tabbed-newterm.patch
+# upstream fix for rhbz#711137
+# http://cvs.schmorp.de/rxvt-unicode/src/screen.C?hideattic=1&r1=1.384&r2=1.385&sortby=date&view=patch
+Patch2:         rxvt-unicode-screen.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fontconfig-devel
@@ -71,6 +74,9 @@ Version of rxvt-unicode with 256color and enhanced multi-language support.
 pushd %{name}-%{version}
 %patch0 -p1 -b .scroll-modupdown
 %patch1 -p1 -b .tabbed-newterm
+pushd src
+%patch2 -b .screen
+popd
 popd
 
 cp -r %{name}-%{version} %{name}-%{version}-ml
@@ -333,6 +339,10 @@ rm -rf %{buildroot}
 %{_datadir}/applications/*rxvt-unicode-256color-ml.desktop
 
 %changelog
+* Wed Jul 06 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 9.12-2
+- fix segfault (rhbz#711137)
+
 * Mon Jul 04 2011 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 9.12-1
 - version upgrade