diff options
| -rw-r--r-- | support/ChangeLog | 4 | ||||
| -rw-r--r-- | support/regex_internal.c | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/support/ChangeLog b/support/ChangeLog index 9ba646f0..24cbcfeb 100644 --- a/support/ChangeLog +++ b/support/ChangeLog @@ -1,3 +1,7 @@ +2018-08-26 Arnold D. Robbins <arnold@skeeve.com> + + * regex_internal.c: Sync with GNULIB. + 2018-08-22 Daniel Richard G. <skunk@iSKUNK.ORG> * regex_internal.h: Undefine additional macros in order diff --git a/support/regex_internal.c b/support/regex_internal.c index 7f0083b9..b10588f1 100644 --- a/support/regex_internal.c +++ b/support/regex_internal.c @@ -317,7 +317,7 @@ build_wcs_upper_buffer (re_string_t *pstr) mbclen = __mbrtowc (&wc, ((const char *) pstr->raw_mbs + pstr->raw_mbs_idx + byte_idx), remain_len, &pstr->cur_state); - if (BE (mbclen < (size_t) -2, 1)) + if (BE (0 < mbclen && mbclen < (size_t) -2, 1)) { wchar_t wcu = __towupper (wc); if (wcu != wc) @@ -386,7 +386,7 @@ build_wcs_upper_buffer (re_string_t *pstr) else p = (const char *) pstr->raw_mbs + pstr->raw_mbs_idx + src_idx; mbclen = __mbrtowc (&wc, p, remain_len, &pstr->cur_state); - if (BE (mbclen < (size_t) -2, 1)) + if (BE (0 < mbclen && mbclen < (size_t) -2, 1)) { wchar_t wcu = __towupper (wc); if (wcu != wc) |