Skip site navigation (1)Skip section navigation (2) 
Date:      Mon, 18 Jul 2016 20:24:13 +0000 (UTC)
From:      "Andrey A. Chernov" <ache@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r303013 - head/lib/libc/gen
Message-ID:  <201607182024.u6IKODvd012386@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: ache
Date: Mon Jul 18 20:24:13 2016
New Revision: 303013
URL: https://svnweb.freebsd.org/changeset/base/303013

Log:
  g_Ctoc() conversion buffers are smaller than needed up to MB_CUR_MAX - 1
  since whole conversion needs a room for (len >= MB_CUR_MAX). It is no
  difference when MB_CUR_MAX == 1, but for multi-byte locales last few chars
  ('\0' and before) may need just one byte, and the rest of MB_CUR_MAX - 1
  space becomes unavailable in the MAXPATHLEN-sized buffer, which cause
  conversion error on near MAXPATHLEN long pathes.
  
  Increase g_Ctoc() conversion buffers to MB_LEN_MAX - 1.

Modified:
  head/lib/libc/gen/glob.c

Modified: head/lib/libc/gen/glob.c
==============================================================================
--- head/lib/libc/gen/glob.c	Mon Jul 18 19:46:31 2016	(r303012)
+++ head/lib/libc/gen/glob.c	Mon Jul 18 20:24:13 2016	(r303013)
@@ -702,7 +702,7 @@ glob3(Char *pathbuf, Char *pathend, Char
 	struct dirent *dp;
 	DIR *dirp;
 	int err;
-	char buf[MAXPATHLEN];
+	char buf[MAXPATHLEN + MB_LEN_MAX - 1];
 
 	struct dirent *(*readdirfunc)(DIR *);
 
@@ -933,7 +933,7 @@ globfree(glob_t *pglob)
 static DIR *
 g_opendir(Char *str, glob_t *pglob)
 {
-	char buf[MAXPATHLEN];
+	char buf[MAXPATHLEN + MB_LEN_MAX - 1];
 
 	if (*str == EOS)
 		strcpy(buf, ".");
@@ -953,7 +953,7 @@ g_opendir(Char *str, glob_t *pglob)
 static int
 g_lstat(Char *fn, struct stat *sb, glob_t *pglob)
 {
-	char buf[MAXPATHLEN];
+	char buf[MAXPATHLEN + MB_LEN_MAX - 1];
 
 	if (g_Ctoc(fn, buf, sizeof(buf))) {
 		errno = ENAMETOOLONG;
@@ -967,7 +967,7 @@ g_lstat(Char *fn, struct stat *sb, glob_
 static int
 g_stat(Char *fn, struct stat *sb, glob_t *pglob)
 {
-	char buf[MAXPATHLEN];
+	char buf[MAXPATHLEN + MB_LEN_MAX - 1];
 
 	if (g_Ctoc(fn, buf, sizeof(buf))) {
 		errno = ENAMETOOLONG;

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201607182024.u6IKODvd012386>