aboutsummaryrefslogtreecommitdiffstats
path: root/lib/readline/mbutil.c
diff options
context:
space:
mode:
authorJari Aalto <jari.aalto@cante.net>2004-11-09 21:37:25 +0000
committerJari Aalto <jari.aalto@cante.net>2009-09-12 16:46:57 +0000
commiteb87367179effbe5f430236db8259006d71438b7 (patch)
tree012cd9de789fea49510f8e25118acf2be9bfa2ed /lib/readline/mbutil.c
parentb80f6443b6b7b620c7272664c66ecb0b120a0998 (diff)
downloadandroid_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.gz
android_external_bash-eb87367179effbe5f430236db8259006d71438b7.tar.bz2
android_external_bash-eb87367179effbe5f430236db8259006d71438b7.zip
Imported from ../bash-3.0.16.tar.gz.
Diffstat (limited to 'lib/readline/mbutil.c')
-rw-r--r--lib/readline/mbutil.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/readline/mbutil.c b/lib/readline/mbutil.c
index 9a8f17c..695845a 100644
--- a/lib/readline/mbutil.c
+++ b/lib/readline/mbutil.c
@@ -126,11 +126,11 @@ _rl_find_next_mbchar_internal (string, seed, count, find_non_zero)
if (find_non_zero)
{
tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
- while (wcwidth (wc) == 0)
+ while (tmp > 0 && wcwidth (wc) == 0)
{
point += tmp;
tmp = mbrtowc (&wc, string + point, strlen (string + point), &ps);
- if (tmp == (size_t)(0) || tmp == (size_t)(-1) || tmp == (size_t)(-2))
+ if (MB_NULLWCH (tmp) || MB_INVALIDCH (tmp))
break;
}
}