diff options
| author | Arnold D. Robbins <arnold@skeeve.com> | 2018-08-26 17:48:39 +0300 |
|---|---|---|
| committer | Arnold D. Robbins <arnold@skeeve.com> | 2018-08-26 17:48:39 +0300 |
| commit | e55f04d807897afff8b89666ef49a1f9479755c7 (patch) | |
| tree | 2b396ced87fdf80f0b352e9e061f90ce69088d30 /support | |
| parent | 417bd669847337ac896292d1ab80da08c215131f (diff) | |
| download | egawk-e55f04d807897afff8b89666ef49a1f9479755c7.tar.gz egawk-e55f04d807897afff8b89666ef49a1f9479755c7.tar.bz2 egawk-e55f04d807897afff8b89666ef49a1f9479755c7.zip | |
Sync regex_internal.c with GNULIB.
Diffstat (limited to 'support')
| -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) |