diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 20:04:47 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 20:04:47 +0000 |
| commit | 9dd6b7799a0b04034f2d2266845c64a309b015a3 (patch) | |
| tree | 0ddf22dfc3d7d7f5b5aab3b6fe830d41075b9067 /posix | |
| parent | a330baa05bf827b67a6391721fa3ab2f72f1f4dc (diff) | |
| download | glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.tar glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.tar.gz glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.tar.bz2 glibc-9dd6b7799a0b04034f2d2266845c64a309b015a3.zip | |
Fix regex wctype namespace (bug 18495).
regcomp brings in references to various wctype functions that aren't
in all the standards including regcomp. This patch fixes this in the
usual way by using the __* versions of these functions (which already
exist, but some didn't have libc_hidden_proto / libc_hidden_def
before).
Tested for x86_64 and x86 (testsuite, and that installed stripped
shared libraries are unchanged by the patch). (Other wide character
function references from the regex code mean that this patch by itself
doesn't fix any XFAILed linknamespace test failures; further patches
will be needed for that.)
[BZ #18495]
* wctype/wcfuncs.c (__iswalnum): Use libc_hidden_def.
(__iswlower): Likewise.
* include/wctype.h (__iswalnum): Declare. Use libc_hidden_proto.
(__iswlower): Likewise.
* posix/regcomp.c (re_compile_fastmap_iter): Call __towlower
instead of towlower.
* posix/regex_internal.c (build_wcs_upper_buffer): Call __iswlower
instead of iswlower. Call __towupper instead of towupper.
* posix/regex_internal.h (IS_WIDE_WORD_CHAR): Call __iswalnum
instead of iswalnum.
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/regcomp.c | 4 | ||||
| -rw-r--r-- | posix/regex_internal.c | 8 | ||||
| -rw-r--r-- | posix/regex_internal.h | 2 |
3 files changed, 7 insertions, 7 deletions
diff --git a/posix/regcomp.c b/posix/regcomp.c index 0adde3d4a8..728c48239f 100644 --- a/posix/regcomp.c +++ b/posix/regcomp.c @@ -334,7 +334,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, memset (&state, '\0', sizeof (state)); if (__mbrtowc (&wc, (const char *) buf, p - buf, &state) == p - buf - && (__wcrtomb ((char *) buf, towlower (wc), &state) + && (__wcrtomb ((char *) buf, __towlower (wc), &state) != (size_t) -1)) re_set_fastmap (fastmap, 0, buf[0]); } @@ -410,7 +410,7 @@ re_compile_fastmap_iter (regex_t *bufp, const re_dfastate_t *init_state, re_set_fastmap (fastmap, icase, *(unsigned char *) buf); if ((bufp->syntax & RE_ICASE) && dfa->mb_cur_max > 1) { - if (__wcrtomb (buf, towlower (cset->mbchars[i]), &state) + if (__wcrtomb (buf, __towlower (cset->mbchars[i]), &state) != (size_t) -1) re_set_fastmap (fastmap, false, *(unsigned char *) buf); } diff --git a/posix/regex_internal.c b/posix/regex_internal.c index e5a14cde20..d77d3a14dc 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -312,11 +312,11 @@ build_wcs_upper_buffer (re_string_t *pstr) if (BE (mbclen + 2 > 2, 1)) { wchar_t wcu = wc; - if (iswlower (wc)) + if (__iswlower (wc)) { size_t mbcdlen; - wcu = towupper (wc); + wcu = __towupper (wc); mbcdlen = wcrtomb (buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); @@ -382,11 +382,11 @@ build_wcs_upper_buffer (re_string_t *pstr) if (BE (mbclen + 2 > 2, 1)) { wchar_t wcu = wc; - if (iswlower (wc)) + if (__iswlower (wc)) { size_t mbcdlen; - wcu = towupper (wc); + wcu = __towupper (wc); mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); diff --git a/posix/regex_internal.h b/posix/regex_internal.h index 7fc6d524e9..154e96999d 100644 --- a/posix/regex_internal.h +++ b/posix/regex_internal.h @@ -471,7 +471,7 @@ typedef struct bin_tree_storage_t bin_tree_storage_t; #define IS_WORD_CHAR(ch) (isalnum (ch) || (ch) == '_') #define IS_NEWLINE(ch) ((ch) == NEWLINE_CHAR) -#define IS_WIDE_WORD_CHAR(ch) (iswalnum (ch) || (ch) == L'_') +#define IS_WIDE_WORD_CHAR(ch) (__iswalnum (ch) || (ch) == L'_') #define IS_WIDE_NEWLINE(ch) ((ch) == WIDE_NEWLINE_CHAR) #define NOT_SATISFY_PREV_CONSTRAINT(constraint,context) \ |