From: Thomas E. Dickey <dickey@invisible-island.net>
Date: Wed, 17 Oct 2012 09:57:52 +0000 (+0000)
Subject: ncurses 5.9 - patch 20121017
X-Git-Tag: v6.0~132
X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=commitdiff_plain;h=6b4de0a4ef55b9505f6d46f0d9886ab0ca30cffe

ncurses 5.9 - patch 20121017

+ fix change to _nc_scroll_optimize(), which incorrectly freed memory
  (Redhat #866989).
---

diff --git a/NEWS b/NEWS
index 1763402b..0e5e93a2 100644
--- a/NEWS
+++ b/NEWS
@@ -25,7 +25,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
--- $Id: NEWS,v 1.1963 2012/10/13 23:19:59 tom Exp $
+-- $Id: NEWS,v 1.1964 2012/10/17 09:31:53 tom Exp $
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
@@ -45,6 +45,10 @@ See the AUTHORS file for the corresponding full names.
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 
+20121017
+	+ fix change to _nc_scroll_optimize(), which incorrectly freed memory 
+	  (Redhat #866989).
+
 20121013
 	+ add vte-2012, gnome-2012, making these the defaults for vte/gnome
 	  (patch by Christian Persch).
diff --git a/dist.mk b/dist.mk
index 993d58ca..f74ae818 100644
--- a/dist.mk
+++ b/dist.mk
@@ -25,7 +25,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
-# $Id: dist.mk,v 1.896 2012/10/13 14:37:04 tom Exp $
+# $Id: dist.mk,v 1.897 2012/10/17 09:32:03 tom Exp $
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
@@ -37,7 +37,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 5
 NCURSES_MINOR = 9
-NCURSES_PATCH = 20121013
+NCURSES_PATCH = 20121017
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
diff --git a/ncurses/tty/hardscroll.c b/ncurses/tty/hardscroll.c
index 58c9655c..4ec168a0 100644
--- a/ncurses/tty/hardscroll.c
+++ b/ncurses/tty/hardscroll.c
@@ -147,7 +147,7 @@ AUTHOR
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: hardscroll.c,v 1.50 2012/09/01 23:24:49 tom Exp $")
+MODULE_ID("$Id: hardscroll.c,v 1.51 2012/10/17 09:01:10 tom Exp $")
 
 #if defined(SCROLLDEBUG) || defined(HASHDEBUG)
 
@@ -205,7 +205,6 @@ NCURSES_SP_NAME(_nc_scroll_optimize) (NCURSES_SP_DCL0)
 				       oldnums(SP_PARM));
 	if (!new_oldnums)
 	    return;
-	FreeIfNeeded(oldnums(SP_PARM));
 	oldnums(SP_PARM) = new_oldnums;
 	OLDNUM_SIZE(SP_PARM) = need_lines;
     }
diff --git a/package/debian/changelog b/package/debian/changelog
index 4472e7c8..1480de82 100644
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (5.9-20121013) unstable; urgency=low
+ncurses6 (5.9-20121017) unstable; urgency=low
 
-  * latest weekly patch
+  * Redhat #866989
 
- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 13 Oct 2012 19:21:12 -0400
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Wed, 17 Oct 2012 05:47:25 -0400
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
diff --git a/package/ncurses.spec b/package/ncurses.spec
index 0f65e387..846ffa67 100644
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Release: 5.9
-Version: 20121013
+Version: 20121017
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{release}-%{version}.tgz