[screen/f16] fix a crash when switching from altscreen after window resize (#784504)

Lukáš Nykrýn lnykryn at fedoraproject.org
Wed Mar 14 11:36:53 UTC 2012


commit 8dd3ee89e8791e198b7b0d80645fbb6d57444e1d
Author: Lukas Nykryn <lnykryn at redhat.com>
Date:   Wed Mar 14 12:28:58 2012 +0100

    fix a crash when switching from altscreen after window resize (#784504)

 screen-4.1.0-resize.patch |   13 +++++++++++++
 screen.spec               |    7 ++++++-
 2 files changed, 19 insertions(+), 1 deletions(-)
---
diff --git a/screen-4.1.0-resize.patch b/screen-4.1.0-resize.patch
new file mode 100644
index 0000000..a56912f
--- /dev/null
+++ b/screen-4.1.0-resize.patch
@@ -0,0 +1,13 @@
+diff --git a/src/resize.c b/src/resize.c
+index ec4742e..0e491eb 100644
+--- a/src/resize.c
++++ b/src/resize.c
+@@ -747,6 +747,8 @@ int wi, he, hi;
+       for (yy = p->w_y + p->w_histheight - 1; yy >= 0 && ncy + shift < he; yy--)
+ 	{
+ 	  ml = OLDWIN(yy);
++	  if (!ml->image)
++	    break;
+ 	  if (ml->image[p->w_width] == ' ')
+ 	    break;
+ 	  shift++;
diff --git a/screen.spec b/screen.spec
index d12a0cb..7c272e8 100644
--- a/screen.spec
+++ b/screen.spec
@@ -3,7 +3,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.1.0
-Release: 0.5.20110328git8cf5ef%{?dist}
+Release: 0.6.20110328git8cf5ef%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -25,6 +25,7 @@ Patch3: screen-ipv6.patch
 Patch4: screen-cc.patch
 Patch5: screen-E3.patch
 Patch6: screen-4.1.0-suppress_remap.patch
+Patch7: screen-4.1.0-resize.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -44,6 +45,7 @@ support multiple logins on one terminal.
 %patch4 -p2 -b .cc
 %patch5 -p2 -b .E3
 %patch6 -p1 -b .suppress_remap
+%patch7 -p2 -b .resize
 
 
 %build
@@ -140,6 +142,9 @@ fi
 %endif
 
 %changelog
+* Wed Mar 14 2012 Lukáš Nykrýn <lnykryn at redhat.com> - 4.1.0-0.6.20110328git8cf5ef
+- fix a crash when switching from altscreen after window resize (#784504)
+
 * Tue Dec 20 2011 Lukáš Nykrýn <lnykryn at redhat.com> - 4.1.0-0.5.20110328git8cf5ef
 - fix for nonworking ^a backspace (#708698)
 


More information about the scm-commits mailing list