(mbsnwidth): Don't loop endlessly when called with an

invalid mulitbyte sequence and with the MBSW_ACCEPT_INVALID flag set.

1 files changed, 10 insertions, 2 deletions

diff --git a/lib/mbswidth.c b/lib/mbswidth.c
index f196ac18d..bb6aa1a6d 100644
--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -153,7 +153,11 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
 		      /* An invalid multibyte sequence was encountered.  */
 		      {
 			if (flags & MBSW_ACCEPT_INVALID)
-			  break;
+			  {
+			    p++;
+			    width++;
+			    break;
+			  }
 			else
 			  return -1;
 		      }
@@ -162,7 +166,11 @@ mbsnwidth (const char *string, size_t nbytes, int flags)
 		      /* An incomplete multibyte character at the end.  */
 		      {
 			if (flags & MBSW_ACCEPT_INVALID)
-			  break;
+			  {
+			    p = plimit;
+			    width++;
+			    break;
+			  }
 			else
 			  return -1;
 		      }