diff options
| author | Chet Ramey <chet.ramey@case.edu> | 2011-11-21 20:51:19 -0500 |
|---|---|---|
| committer | Chet Ramey <chet.ramey@case.edu> | 2011-11-21 20:51:19 -0500 |
| commit | 0001803f0b9523c94fa2ede48eaecb047fef4524 (patch) | |
| tree | f334332811e033ff966d94f6268f0629a94304b3 /lib/readline/mbutil.c | |
| parent | 89a92869e56aba4e4cab2d639c00a86f0545c862 (diff) | |
| download | android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.tar.gz android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.tar.bz2 android_external_bash-0001803f0b9523c94fa2ede48eaecb047fef4524.zip | |
Bash-4.1 distribution source
Diffstat (limited to 'lib/readline/mbutil.c')
| -rw-r--r-- | lib/readline/mbutil.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/readline/mbutil.c b/lib/readline/mbutil.c index 858842e..eeb7e55 100644 --- a/lib/readline/mbutil.c +++ b/lib/readline/mbutil.c @@ -77,7 +77,7 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) char *string; int seed, count, find_non_zero; { - size_t tmp; + size_t tmp, len; mbstate_t ps; int point; wchar_t wc; @@ -99,7 +99,10 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero) while (count > 0) { - tmp = mbrtowc (&wc, string+point, strlen(string + point), &ps); + len = strlen (string + point); + if (len == 0) + break; + tmp = mbrtowc (&wc, string+point, len, &ps); if (MB_INVALIDCH ((size_t)tmp)) { /* invalid bytes. assume a byte represents a character */ |