ncurses 6.2 - patch 20200301

+ modify wbkgd() and wbkgrnd() to avoid storing a null in the
  background character, because it may be used in cases where the
  corresponding 0x80 is not treated as a null (report by Marc Rechte,
  cf: 20181208).

diff --git a/NEWS b/NEWS
index b32e49ccf01d00032f5586f075ca859b5ff65d99..979c98c2f1b21fc937dd330c560becb120c4ddc8 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -26,7 +26,7 @@
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------
 -- sale, use or other dealings in this Software without prior written        --
 -- authorization.                                                            --
 -------------------------------------------------------------------------------

--- $Id: NEWS,v 1.3455 2020/02/29 23:15:52 tom Exp $
+-- $Id: NEWS,v 1.3456 2020/03/02 01:55:08 tom Exp $

 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started
 -------------------------------------------------------------------------------
 
 This is a log of changes that ncurses has gone through since Zeyd started


@@ -46,6 +46,12 @@ 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.
 
 Changes through 1.9.9e did not credit all contributions;
 it is not possible to add this information.
 

+20200301
+       + modify wbkgd() and wbkgrnd() to avoid storing a null in the
+         background character, because it may be used in cases where the
+         corresponding 0x80 is not treated as a null (report by Marc Rechte,
+         cf: 20181208).
+

 20200229
        + modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
          which conflicts with conventional use for passing linker options.
 20200229
        + modify CF_NCURSES_CONFIG to work around xcode's c99 "-W" option,
          which conflicts with conventional use for passing linker options.

diff --git a/VERSION b/VERSION
index 1d68683b384ee4545124dcec60f33bb4d6a959ab..2d8d43af5bcc0db2c3ad5383271937751eb31ec0 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-5:0:10 6.2     20200229
+5:0:10 6.2     20200301

diff --git a/dist.mk b/dist.mk
index 9ae5cf754b55dd8b325137bb059b9be9abfd05c2..1f01bf3187bb2be374dbaa5a32164a35122772e2 100644 (file)
--- a/dist.mk
+++ b/dist.mk
@@ -26,7 +26,7 @@
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################
 # use or other dealings in this Software without prior written               #
 # authorization.                                                             #
 ##############################################################################

-# $Id: dist.mk,v 1.1337 2020/02/29 12:43:09 tom Exp $
+# $Id: dist.mk,v 1.1338 2020/03/02 01:55:47 tom Exp $

 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but
 # Makefile for creating ncurses distributions.
 #
 # This only needs to be used directly as a makefile by developers, but


@@ -38,7 +38,7 @@ SHELL = /bin/sh
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2
 # These define the major/minor/patch versions of ncurses.
 NCURSES_MAJOR = 6
 NCURSES_MINOR = 2

-NCURSES_PATCH = 20200229
+NCURSES_PATCH = 20200301

 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)
 
 # We don't append the patch to the version, since this only applies to releases
 VERSION = $(NCURSES_MAJOR).$(NCURSES_MINOR)

diff --git a/ncurses/base/lib_bkgd.c b/ncurses/base/lib_bkgd.c
index 2030030f91a5255ec3192bf75eccb6cb3b538c76..1dcae90d6ad955c1576f46a556fb54635d078a18 100644 (file)
--- a/ncurses/base/lib_bkgd.c
+++ b/ncurses/base/lib_bkgd.c
@@ -37,7 +37,9 @@
 
 #include <curses.priv.h>
 
 
 #include <curses.priv.h>
 

-MODULE_ID("$Id: lib_bkgd.c,v 1.54 2020/02/02 23:34:34 tom Exp $")
+MODULE_ID("$Id: lib_bkgd.c,v 1.55 2020/03/02 01:34:48 tom Exp $")
+
+static const NCURSES_CH_T blank = NewChar(BLANK_TEXT);

 
 /*
  * Set the window's background information.
 
 /*
  * Set the window's background information.


@@ -143,6 +145,14 @@ wbkgrnd(WINDOW *win, const ARG_CH_T ch)
            SetPair(new_bkgd, 0);
        }
 
            SetPair(new_bkgd, 0);
        }
 

+       /* avoid setting background-character to a null */
+       if (CharOf(new_bkgd) == 0) {
+           NCURSES_CH_T tmp_bkgd = blank;
+           SetAttr(tmp_bkgd, AttrOf(new_bkgd));
+           SetPair(tmp_bkgd, GetPair(new_bkgd));
+           new_bkgd = tmp_bkgd;
+       }
+

        memset(&old_bkgd, 0, sizeof(old_bkgd));
        (void) wgetbkgrnd(win, &old_bkgd);
 
        memset(&old_bkgd, 0, sizeof(old_bkgd));
        (void) wgetbkgrnd(win, &old_bkgd);
 

diff --git a/package/debian-mingw/changelog b/package/debian-mingw/changelog
index 1b1bbca0cc3835334b86e6da9956b74b35a9761e..b92e00e84342baa15a14b2a14771ca1d26afdc43 100644 (file)
--- a/package/debian-mingw/changelog
+++ b/package/debian-mingw/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Mar 2020 20:55:47 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian-mingw64/changelog b/package/debian-mingw64/changelog
index 1b1bbca0cc3835334b86e6da9956b74b35a9761e..b92e00e84342baa15a14b2a14771ca1d26afdc43 100644 (file)
--- a/package/debian-mingw64/changelog
+++ b/package/debian-mingw64/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Mar 2020 20:55:47 -0500

 
 ncurses6 (5.9-20131005) unstable; urgency=low
 
 
 ncurses6 (5.9-20131005) unstable; urgency=low
 

diff --git a/package/debian/changelog b/package/debian/changelog
index a8234d24ce9b8a30e677436681f49c6a6325590a..fef7063850599b65fa9bf497f34c8f7f0144b4cc 100644 (file)
--- a/package/debian/changelog
+++ b/package/debian/changelog
@@ -1,8 +1,8 @@
-ncurses6 (6.2+20200229) unstable; urgency=low
+ncurses6 (6.2+20200301) unstable; urgency=low

 
   * latest weekly patch
 
 
   * latest weekly patch
 

- -- Thomas E. Dickey <dickey@invisible-island.net>  Sat, 29 Feb 2020 07:43:09 -0500
+ -- Thomas E. Dickey <dickey@invisible-island.net>  Sun, 01 Mar 2020 20:55:47 -0500

 
 ncurses6 (5.9-20120608) unstable; urgency=low
 
 
 ncurses6 (5.9-20120608) unstable; urgency=low
 

diff --git a/package/mingw-ncurses.nsi b/package/mingw-ncurses.nsi
index 848a3e42d920c8a1a878dc2d31c7c8007ecec879..c836891255f7a2309bc6023d85f36fb46fc53d7f 100644 (file)
--- a/package/mingw-ncurses.nsi
+++ b/package/mingw-ncurses.nsi
@@ -1,4 +1,4 @@
-; $Id: mingw-ncurses.nsi,v 1.380 2020/02/29 12:43:09 tom Exp $\r
+; $Id: mingw-ncurses.nsi,v 1.381 2020/03/02 01:55:47 tom Exp $\r

 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r
 \r
 ; TODO add examples\r
 ; TODO bump ABI to 6\r


@@ -10,7 +10,7 @@
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r
 !define VERSION_MAJOR "6"\r
 !define VERSION_MINOR "2"\r
 !define VERSION_YYYY  "2020"\r

-!define VERSION_MMDD  "0229"\r
+!define VERSION_MMDD  "0301"\r

 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r
 !define VERSION_PATCH ${VERSION_YYYY}${VERSION_MMDD}\r
 \r
 !define MY_ABI   "5"\r

diff --git a/package/mingw-ncurses.spec b/package/mingw-ncurses.spec
index 00612f7d6d44805e7c15a71a61869a0a88f81a7b..49644546475b3c75e0ce269cf4f1af790e976835 100644 (file)
--- a/package/mingw-ncurses.spec
+++ b/package/mingw-ncurses.spec
@@ -3,7 +3,7 @@
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: mingw32-ncurses6
 Version: 6.2

-Release: 20200229
+Release: 20200301

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncurses.spec b/package/ncurses.spec
index a4f7b153d66b35e1179e7f5db3eeb096b4604607..7ecf505e4c51579547537be5bc378e2b4859ebc8 100644 (file)
--- a/package/ncurses.spec
+++ b/package/ncurses.spec
@@ -1,7 +1,7 @@
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2
 Summary: shared libraries for terminal handling
 Name: ncurses6
 Version: 6.2

-Release: 20200229
+Release: 20200301

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz

diff --git a/package/ncursest.spec b/package/ncursest.spec
index e81986d29b36edc9ca8d436af36256bf60cf85c4..d946982974a59fbbb983271687fdc1118452bc35 100644 (file)
--- a/package/ncursest.spec
+++ b/package/ncursest.spec
@@ -1,7 +1,7 @@
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2
 Summary: Curses library with POSIX thread support.
 Name: ncursest6
 Version: 6.2

-Release: 20200229
+Release: 20200301

 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz
 License: X11
 Group: Development/Libraries
 Source: ncurses-%{version}-%{release}.tgz