LineageOS/android_external_bash
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bash-4.4 patch 3

Browse Source
This commit is contained in:
Chet Ramey
2016-11-14 14:27:23 -05:00
parent 280bd77d8d
commit 4f59a8babc
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/glob/sm_loop.c
View File

@@ -330,6 +330,12 @@ PARSE_COLLSYM (p, vp)
for (pc = 0; p[pc]; pc++) for (pc = 0; p[pc]; pc++)
if (p[pc] == L('.') && p[pc+1] == L(']')) if (p[pc] == L('.') && p[pc+1] == L(']'))
break; break;
if (p[pc] == 0)
{
if (vp)
*vp = INVALID;
return (p + pc);
}
val = COLLSYM (p, pc); val = COLLSYM (p, pc);
if (vp) if (vp)
*vp = val; *vp = val;
@@ -483,6 +489,9 @@ BRACKMATCH (p, test, flags)
c = *p++; c = *p++;
c = FOLD (c); c = FOLD (c);
if (c == L('\0'))
return ((test == L('[')) ? savep : (CHAR *)0);
if ((flags & FNM_PATHNAME) && c == L('/')) if ((flags & FNM_PATHNAME) && c == L('/'))
/* [/] can never match when matching a pathname. */ /* [/] can never match when matching a pathname. */
return (CHAR *)0; return (CHAR *)0;

2
patchlevel.h
View File

@@ -25,6 +25,6 @@
regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh regexp `^#define[ ]*PATCHLEVEL', since that's what support/mkversion.sh
looks for to find the patch level (for the sccs version string). */ looks for to find the patch level (for the sccs version string). */
#define PATCHLEVEL 2 #define PATCHLEVEL 3
#endif /* _PATCHLEVEL_H_ */ #endif /* _PATCHLEVEL_H_ */