summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgordon <gordon@FreeBSD.org>2010-05-19 22:03:45 +0000
committergordon <gordon@FreeBSD.org>2010-05-19 22:03:45 +0000
commit66f9b83110b17ba68a936b1076cc39796bdbad2d (patch)
tree0b9d0e96f2592daab00eae23249dc2a58c21b8ba
parent9c58b05a1de28ae80cd7dbb8899fa5be7672eecf (diff)
downloadFreeBSD-src-66f9b83110b17ba68a936b1076cc39796bdbad2d.zip
FreeBSD-src-66f9b83110b17ba68a936b1076cc39796bdbad2d.tar.gz
MFC r207981:
Fix a bug due to a type conversion from 64 to 32 bits. The side effect of this type conversion is the high bits which were used to indicate if a special character was a literal or special were dropped. As a result, all special character were treated as special, even if they were supposed to be literals. Approved by: mentor (wes@)
-rw-r--r--lib/libc/gen/glob.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libc/gen/glob.c b/lib/libc/gen/glob.c
index 32af5db..c3d9f08 100644
--- a/lib/libc/gen/glob.c
+++ b/lib/libc/gen/glob.c
@@ -433,9 +433,9 @@ static int
glob0(const Char *pattern, glob_t *pglob, size_t *limit)
{
const Char *qpatnext;
- int c, err;
+ int err;
size_t oldpathc;
- Char *bufnext, patbuf[MAXPATHLEN];
+ Char *bufnext, c, patbuf[MAXPATHLEN];
qpatnext = globtilde(pattern, patbuf, MAXPATHLEN, pglob);
oldpathc = pglob->gl_pathc;
OpenPOWER on IntegriCloud