diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index dc9127d56190..972d2aa0908b 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -1,7 +1,7 @@ # $NetBSD: Makefile,v 1.99 2018/09/15 22:47:41 wiz Exp $ .include "Makefile.common" -PKGREVISION= 2 +PKGREVISION= 3 COMMENT= CRT screen handling and optimization package INSTALLATION_DIRS+= share/examples diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo index 8328cfbcb18d..61fb94c540c6 100644 --- a/devel/ncurses/distinfo +++ b/devel/ncurses/distinfo @@ -12,3 +12,4 @@ SHA1 (patch-c++_Makefile.in) = 68ff81c719ec4aa13beb962cb66d7cd6749d7af5 SHA1 (patch-configure.in) = 48a705b3f4de3a65c0c1c3648f5a24c5310ed3fa SHA1 (patch-misc_ncurses-config.in) = 43e4dc8abe85804513da1189aeffa5c7746ffcca SHA1 (patch-ncurses_base_MKlib__gen.sh) = f8ce67fbd273529e4161a2820677d05a623fd527 +SHA1 (patch-ncurses_tinfo_parse__entry.c) = 06d2b52e84595f8acd47ad36ded7b7d5bec95b8a diff --git a/devel/ncurses/patches/patch-ncurses_tinfo_parse__entry.c b/devel/ncurses/patches/patch-ncurses_tinfo_parse__entry.c new file mode 100644 index 000000000000..0bbe1862babe --- /dev/null +++ b/devel/ncurses/patches/patch-ncurses_tinfo_parse__entry.c @@ -0,0 +1,23 @@ +$NetBSD$ + + - Fixes CVE-2018-10754 + +--- ncurses/tinfo/parse_entry.c.orig 2018-10-09 21:41:29.020445746 +0000 ++++ ncurses/tinfo/parse_entry.c +@@ -543,11 +543,12 @@ _nc_parse_entry(ENTRY * entryp, int lite + * Otherwise, look for a base entry that will already + * have picked up defaults via translation. + */ +- for (i = 0; i < entryp->nuses; i++) +- if (!strchr((char *) entryp->uses[i].name, '+')) +- has_base_entry = TRUE; ++ for (i = 0; i < entryp->nuses; i++) { ++ if (entryp->uses[i].name != 0 ++ && !strchr(entryp->uses[i].name, '+')) ++ has_base_entry = TRUE; ++ } + } +- + postprocess_termcap(&entryp->tterm, has_base_entry); + } else + postprocess_terminfo(&entryp->tterm); diff --git a/devel/ncursesw/Makefile b/devel/ncursesw/Makefile index d93afc4b04fe..ac253ae594e3 100644 --- a/devel/ncursesw/Makefile +++ b/devel/ncursesw/Makefile @@ -4,6 +4,7 @@ PKGNAME= ${DISTNAME:S/ncurses/ncursesw/} COMMENT= Wide character CRT screen handling and optimization package +PKGREVISION= 1 PATCHDIR= ${.CURDIR}/../../devel/ncurses/patches DISTINFO_FILE= ${.CURDIR}/../../devel/ncurses/distinfo