head	1.2;
access;
symbols
	pkgsrc-2018Q1:1.1.0.2
	pkgsrc-2018Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2018.04.29.20.41.04;	author ryoon;	state dead;
branches;
next	1.1;
commitid	VhdhTPdoLEJ2xnAA;

1.1
date	2018.03.30.20.56.42;	author spz;	state Exp;
branches;
next	;
commitid	1L4SSfCpakZ9zwwA;


desc
@@


1.2
log
@Update to 5.5.1

Changelog:
Changes from %.5 to 5.5.1
-------------------------

Apart from a fix for a configuration problem finding singal names from
(some) recent versions of glibc, there are only minor changes.

Changes from 5.4.2 to 5.5
-------------------------

The effect of the NO_INTERACTIVE_COMMENTS option extends into $(...) and
`...` command substitutions when used on the command line.  Previously,
comments were always recognized within command substitutions unless the
comment character "#" was disabled via reset of $histchars.

An alternative assignment syntax for indicating indices for arrays
and keys for associative arrays:

typeset -a array=([1]=first [2]=second)
typeset -A assoc=([key1]=val1 [key2]=val2)

is allowed for compatibility with other shells.  In the case of normal
arrays the new syntax can be mixed with the old.
@
text
@$NetBSD: patch-CVE-2018-1083,v 1.1 2018/03/30 20:56:42 spz Exp $

patch for CVE-2018-1083 from
https://sourceforge.net/p/zsh/code/ci/259ac472eac291c8c103c7a0d8a4eaf3c2942ed7

--- Src/Zle/compctl.c.orig	2017-06-30 20:36:55.000000000 +0000
+++ Src/Zle/compctl.c	2018-03-30 20:07:25.000000000 +0000
@@@@ -2176,6 +2176,8 @@@@
     if (prpre && *prpre) {
 	pathpref = dupstring(prpre);
 	unmetafy(pathpref, &pathpreflen);
+	if (pathpreflen > PATH_MAX)
+	    return;
 	/* system needs NULL termination, not provided by unmetafy */
 	pathpref[pathpreflen] = '\0';
     } else {
@@@@ -2218,6 +2220,8 @@@@
 		     * the path buffer by appending the filename.       */
 		    ums = dupstring(n);
 		    unmetafy(ums, &umlen);
+		    if (umlen + pathpreflen + 1 > PATH_MAX)
+			continue;
 		    memcpy(q, ums, umlen);
 		    q[umlen] = '\0';
 		    /* And do the stat. */
@@@@ -2232,6 +2236,8 @@@@
 			/* We have to test for a path suffix. */
 			int o = strlen(p), tt;
 
+			if (o + strlen(psuf) > PATH_MAX)
+			    continue;
 			/* Append it to the path buffer. */
 			strcpy(p + o, psuf);
 
@


1.1
log
@add security patches for CVE-2018-1071, CVE-2018-1083, CVE-2018-7548
and CVE-2018-7549 from the zsh repo. one pullup less, w00t. :-P
@
text
@d1 1
a1 1
$NetBSD: $
@