# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1535254855 25200
# Node ID 6309c73afeb5688ad00a1272b3f2cc8e75d368c4
# Parent  22dbfb1640417102677d0d03c75dd394b068b344
autoupdate

diff -r 22dbfb164041 -r 6309c73afeb5 lib/regex_internal.c
--- a/lib/regex_internal.c	Sat Aug 25 08:22:51 2018 -0700
+++ b/lib/regex_internal.c	Sat Aug 25 20:40:55 2018 -0700
@@ -317,7 +317,7 @@
 	  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 @@
 	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)