diff options
Diffstat (limited to 'posix')
| -rw-r--r-- | posix/regex_internal.c | 15 | ||||
| -rw-r--r-- | posix/regexec.c | 6 |
2 files changed, 12 insertions, 9 deletions
diff --git a/posix/regex_internal.c b/posix/regex_internal.c index c3295a851c..779d0b7334 100644 --- a/posix/regex_internal.c +++ b/posix/regex_internal.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -214,7 +214,8 @@ build_wcs_buffer (pstr) re_string_t *pstr; { #ifdef _LIBC - unsigned char buf[pstr->mb_cur_max]; + unsigned char buf[MB_CUR_MAX]; + assert (MB_CUR_MAX >= pstr->mb_cur_max); #else unsigned char buf[64]; #endif @@ -282,9 +283,10 @@ build_wcs_upper_buffer (pstr) mbstate_t prev_st; int src_idx, byte_idx, end_idx, mbclen, remain_len; #ifdef _LIBC - unsigned char buf[pstr->mb_cur_max]; + char buf[MB_CUR_MAX]; + assert (MB_CUR_MAX >= pstr->mb_cur_max); #else - unsigned char buf[64]; + char buf[64]; #endif byte_idx = pstr->valid_len; @@ -666,8 +668,9 @@ re_string_reconstruct (pstr, idx, eflags) /* XXX Don't use mbrtowc, we know which conversion to use (UTF-8 -> UCS4). */ memset (&cur_state, 0, sizeof (cur_state)); - mlen = mbrtowc (&wc2, p, mlen, &cur_state) - - (raw + offset - p); + mlen = (mbrtowc (&wc2, (const char *) p, mlen, + &cur_state) + - (raw + offset - p)); if (mlen >= 0) { memset (&pstr->cur_state, '\0', diff --git a/posix/regexec.c b/posix/regexec.c index 636396e6f7..3c226e3c20 100644 --- a/posix/regexec.c +++ b/posix/regexec.c @@ -1,5 +1,5 @@ /* Extended regular expression matching and search library. - Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. + Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Isamu Hasegawa <isamu@yamato.ibm.com>. @@ -3781,8 +3781,8 @@ check_node_accept_bytes (dfa, node_idx, input, str_idx) { const re_charset_t *cset = node->opr.mbcset; # ifdef _LIBC - const unsigned char *pin = ((char *) re_string_get_buffer (input) - + str_idx); + const unsigned char *pin + = ((const unsigned char *) re_string_get_buffer (input) + str_idx); int j; uint32_t nrules; # endif /* _LIBC */ |