Tue Oct 8 03:52:44 2019 UTC ()

Open code the validity test & copy of the character class name in
a bracket expression in a pattern (ie: [[:THISNAME:]]).   Previously
the code used strspn() to look for invalid chars in the name, and
then memcpy(), now we do the test and copy a character at a time.
This might, or might not, be faster, but it now correctly handles
\ quoted characters in the name (' and " quoting were already
dealt with, \ was too in an earlier version, but when the \ handling
changes were made, this piece of code broke).

Not exactly a vital bug fix (who writes [[:\alpha:]] or similar?)
but it should work correctly regardless of how obscure the usage is.

Problem noted by Harald van Dijk

XXX pullup -9


(kre)

diff -r1.132 -r1.133 src/bin/sh/expand.c

--- src/bin/sh/expand.c 2019/04/10 08:13:11	1.132
+++ src/bin/sh/expand.c 2019/10/08 03:52:44	1.133

 @@ -1,14 +1,14 @@
-/*	$NetBSD: expand.c,v 1.132 2019/04/10 08:13:11 kre Exp $	*/
+/*	$NetBSD: expand.c,v 1.133 2019/10/08 03:52:44 kre Exp $	*/
 /*-
  * Copyright (c) 1991, 1993
  *	The Regents of the University of California.  All rights reserved.
+ *
  * This code is derived from software contributed to Berkeley by
  * Kenneth Almquist.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -27,27 +27,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)expand.c	8.5 (Berkeley) 5/15/95";
 #else
-__RCSID("$NetBSD: expand.c,v 1.132 2019/04/10 08:13:11 kre Exp $");
+__RCSID("$NetBSD: expand.c,v 1.133 2019/10/08 03:52:44 kre Exp $");
 #endif
 #endif /* not lint */
 #include <sys/types.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <errno.h>
 #include <dirent.h>
 #include <unistd.h>
 #include <pwd.h>
 #include <limits.h>
 #include <stdlib.h>
 #include <stdio.h>
 @@ -1782,44 +1782,64 @@ msort(struct strlist *list, int len)
 /*
  * See if a character matches a character class, starting at the first colon
  * of "[:class:]".
  * If a valid character class is recognized, a pointer to the next character
  * after the final closing bracket is stored into *end, otherwise a null
  * pointer is stored into *end.
  */
 static int
 match_charclass(const char *p, wchar_t chr, const char **end)
+{
 	char name[20];
 	char *nameend;
 	wctype_t cclass;
 	char *q;
 	*end = NULL;
 	p++;
 	q = &name[0];
 	nameend = strstr(p, ":]");
 	if (nameend == NULL || nameend == p)	/* not a valid class */
 		return 0;
-	if (!is_alpha(*p) || strspn(p,		/* '_' is a local extension */
+	if (*p == CTLESC) {
-	    "0123456789"  "_"
+		if (*++p == CTLESC)
-	    "abcdefghijklmnopqrstuvwxyz"
+			return 0;
-	    "ABCDEFGHIJKLMNOPQRSTUVWXYZ") != (size_t)(nameend - p))
+		if (p == nameend)
 			return 0;
+	}
 	if (!is_alpha(*p))
 		return 0;
 	while (p < nameend) {
 		if (*p == CTLESC) {
 			p++;
 			if (p == nameend)
 				return 0;
+		}
 		if (!is_in_name(*p))	/* '_' is a local extension */
 			return 0;
 		if (q < &name[sizeof name])
 			*q++ = *p++;
 		else
 			p++;
+	}
 	*end = nameend + 2;		/* committed to it being a char class */
 	if ((size_t)(nameend - p) >= sizeof(name))	/* but too long */
-		return 0;				/* so no match */
+	if (q < &name[sizeof name])	/* a usable name found */
-	memcpy(name, p, nameend - p);
+		*q++ = '\0';
-	name[nameend - p] = '\0';
+	else				/* too long, valid, but no match */
 		return 0;
 	cclass = wctype(name);
 	/* An unknown class matches nothing but is valid nevertheless. */
 	if (cclass == 0)
 		return 0;
 	return iswctype(chr, cclass);
+}
 /*
  * Returns true if the pattern matches the string.
  */
 STATIC int