[screen/f18] Segfault in alternate screen handling (#948617)

[Petr Hracek]

commit d443bf9917ece8b1b68cbedb15853c4d703108c2
Author: Petr Hracek <phracek at redhat.com>
Date:   Tue Jun 18 16:06:04 2013 +0200

    Segfault in alternate screen handling (#948617)

 screen-altscreen.patch |   14 ++++++++++++++
 screen.spec            |   29 +++++++++++++++++------------
 2 files changed, 31 insertions(+), 12 deletions(-)
---
diff --git a/screen-altscreen.patch b/screen-altscreen.patch
new file mode 100644
index 0000000..49e5cc4
--- /dev/null
+++ b/screen-altscreen.patch
@@ -0,0 +1,14 @@
+diff --git a/src/ansi.c b/src/ansi.c
+index d88e153..8df79b2 100644
+--- a/src/ansi.c
++++ b/src/ansi.c
+@@ -1438,8 +1438,8 @@ int c, intermediate;
+ 		    }
+ 		  else
+ 		    {
+-		      LeaveAltScreen(curr);
+ 		      RestoreCursor(&curr->w_alt.cursor);
++		      LeaveAltScreen(curr);
+ 		    }
+ 		  if (a1 == 47 && !i)
+ 		    curr->w_saved.on = 0;
diff --git a/screen.spec b/screen.spec
index ed34ebc..ca9a318 100644
--- a/screen.spec
+++ b/screen.spec
@@ -4,7 +4,7 @@
 Summary: A screen manager that supports multiple logins on one terminal
 Name: screen
 Version: 4.1.0
-Release: 0.14.20120314git3c2946%{?dist}
+Release: 0.15.20120314git3c2946%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://www.gnu.org/software/screen
@@ -29,6 +29,7 @@ Patch6: screen-4.1.0-suppress_remap.patch
 Patch7: screen-4.1.0-reattach.patch
 Patch8: screen-4.1.0-crypt.patch
 Patch9: screen-4.1.0-long-term.patch
+Patch10: screen-altscreen.patch
 
 %description
 The screen utility allows you to have multiple logins on just one
@@ -51,6 +52,7 @@ support multiple logins on one terminal.
 %patch7 -p2 -b .reattach
 %patch8 -p2 -b .crypto
 %patch9 -p2 -b .long-term
+%patch10 -p2 -b .altscreen.patch
 
 
 %build
@@ -147,6 +149,9 @@ fi
 %endif
 
 %changelog
+* Tue Jun 18 2013 Petr Hracek <phracek at redhat.com> - 4.1.0-0.15.20120314git3c2946
+- Fix: Segfault in alternate screen handling (#948617)
+
 * Tue Feb 05 2013 Petr Hracek <phracek at redhat.com> - 4.1.0-0.14.20120314git3c2946
 - Fix (#907472) xterm too long - sorry
 
@@ -182,7 +187,7 @@ fi
 - update to git snapshot 20110328git8cf5ef
 - clear scrollback buffer before locking linux terminal (#683733)
 
-* Tue Feb 10 2011 Miroslav Lichvar <mlichvar at redhat.com> - 4.1.0-0.3.20101110git066b098
+* Thu Feb 10 2011 Miroslav Lichvar <mlichvar at redhat.com> - 4.1.0-0.3.20101110git066b098
 - move sockets back to /var/run/screen (#676663)
 
 * Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.1.0-0.2.20101110git066b098
@@ -250,7 +255,7 @@ fi
 * Fri Jan 5 2007 Marcela Maslanova <mmaslano at redhat.com> - 4.0.3-2
 - rebuilt (change in spec file)
 
-* Wed Oct 15 2006 Marcela Maslanova <mmaslano at redhat.com> - 4.0.3-1
+* Sun Oct 15 2006 Marcela Maslanova <mmaslano at redhat.com> - 4.0.3-1
 - new version from upstream
 - ipv6 patch #198410
 
@@ -346,16 +351,16 @@ and thus, the patch isn't necessary.)
 - Comment out lines in screenrc causing screen to complain
 at startup.
 
-* Tue Jul 10 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-11
+* Thu Jul 10 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-11
 - Rebuilt 
 
-* Tue Jul 10 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-10
+* Thu Jul 10 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-10
 - Put the bindkey back in for now.
 
-* Mon Jul 01 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-9
+* Tue Jul 01 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-9
 - Rebuilt
 
-* Mon Jul 01 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-8
+* Tue Jul 01 2003 Lon Hohberger <lhh at redhat.com> 3.9.15-8
 - Change screen's behavior to do the following: Attempt to use
 ~/.screen as the screen directory.  Failing that (ie, on files
 systems without Unix sockets support), try using /tmp/screen-<USER>.
@@ -418,10 +423,10 @@ for build 2.
 * Wed Aug 14 2002 Philip Copeland <bryce at redhat.com> 3.9.11-10
 - #65344 - doomed by utf8
 
-* Tue Aug 12 2002 Philip Copeland <bryce at redhat.com> 3.9.11-9
+* Mon Aug 12 2002 Philip Copeland <bryce at redhat.com> 3.9.11-9
 - #60597 - what /shall/ we make the defaults today?
 
-* Thu Jul 17 2002 Philip Copeland <bryce at redhat.com> 3.9.11-8
+* Wed Jul 17 2002 Philip Copeland <bryce at redhat.com> 3.9.11-8
 - Prevent the makefile from stripping the binary
 - Really get rid of the libelf dependancy
 
@@ -476,7 +481,7 @@ for build 2.
 - update to 3.9.8
 - change the .jbj patch and add some more "user" -> "auser" cases
 
-* Thu Aug 15 2000 Crutcher Dunnavant <crutcher at redhat.com>
+* Tue Aug 15 2000 Crutcher Dunnavant <crutcher at redhat.com>
 - Patched the documentation to change the 'C-a C-\' to 'C-a \',
 - which is what is the real behaviour. this fixes bug #16103
 
@@ -536,7 +541,7 @@ for build 2.
 * Wed Jun 16 1999 Bill Nottingham <notting at redhat.com>
 - force tty permissions/group
 
-* Wed Jun 5 1999 Dale Lovelace <dale at redhat.com>
+* Sat Jun 5 1999 Dale Lovelace <dale at redhat.com>
 - permissions on /etc/skel/.screenrc to 644
 
 * Mon Apr 26 1999 Bill Nottingham <notting at redhat.com>
@@ -566,7 +571,7 @@ for build 2.
 * Mon Apr 27 1998 Prospector System <bugs at redhat.com>
 - translations modified for de, fr, tr
 
-* Wed Oct 21 1997 Cristian Gafton <gafton at redhat.com>
+* Tue Oct 21 1997 Cristian Gafton <gafton at redhat.com>
 - upgraded to 3.7.4
 
 * Wed Oct 08 1997 Erik Troan <ewt at redhat.com>