diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 21:31:39 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2015-06-05 21:31:39 +0000 |
| commit | a5f0adb39b3a029b3fcd1b0d879eb45d9bd742cd (patch) | |
| tree | 72b208fb2ca945da27bdf767170a96fe4bdc1b02 /posix/regex_internal.c | |
| parent | 007f2dd1228a4b21b10756c696876babb8cf86cd (diff) | |
| download | glibc-a5f0adb39b3a029b3fcd1b0d879eb45d9bd742cd.zip glibc-a5f0adb39b3a029b3fcd1b0d879eb45d9bd742cd.tar.gz glibc-a5f0adb39b3a029b3fcd1b0d879eb45d9bd742cd.tar.bz2 | |
Fix regex wcrtomb namespace (bug 18496).
The regex code brings in references to wcrtomb, which isn't in all the
standards that contain regex. This patch makes it call __wcrtomb
instead (in fact some places already called __wcrtomb, so this patch
makes it internally consistent about which name is used).
Tested for x86_64 and x86 that installed stripped shared libraries are
unchanged by the patch.
[BZ #18496]
* posix/regex_internal.c (build_wcs_upper_buffer): Call __wcrtomb
instead of wcrtomb.
Diffstat (limited to 'posix/regex_internal.c')
| -rw-r--r-- | posix/regex_internal.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c index d77d3a1..8597d7e 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -317,7 +317,7 @@ build_wcs_upper_buffer (re_string_t *pstr) size_t mbcdlen; wcu = __towupper (wc); - mbcdlen = wcrtomb (buf, wcu, &prev_st); + mbcdlen = __wcrtomb (buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); else @@ -387,7 +387,7 @@ build_wcs_upper_buffer (re_string_t *pstr) size_t mbcdlen; wcu = __towupper (wc); - mbcdlen = wcrtomb ((char *) buf, wcu, &prev_st); + mbcdlen = __wcrtomb ((char *) buf, wcu, &prev_st); if (BE (mbclen == mbcdlen, 1)) memcpy (pstr->mbs + byte_idx, buf, mbclen); else if (mbcdlen != (size_t) -1) |