From 3fd8d4f4f75f22c6758d8323cf7f24ab4bdc3464 Mon Sep 17 00:00:00 2001 From: Chris Toshok Date: Fri, 4 Apr 2003 20:59:48 +0000 Subject: fix abr. (e_name_western_get_suffix_at_str_end): same. 2003-04-04 Chris Toshok * ename/e-name-western.c (e_name_western_extract_middle): fix abr. (e_name_western_get_suffix_at_str_end): same. svn path=/trunk/; revision=20676 --- e-util/ename/e-name-western.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'e-util/ename') diff --git a/e-util/ename/e-name-western.c b/e-util/ename/e-name-western.c index 33c9d53f6c..081ddc64e0 100644 --- a/e-util/ename/e-name-western.c +++ b/e-util/ename/e-name-western.c @@ -299,8 +299,10 @@ e_name_western_extract_middle (ENameWestern *name, ENameWesternIdxs *idxs) return; middle = name->full + idxs->first_idx + strlen (name->first); - middle = g_utf8_next_char (middle); + if (*middle == '\0') + return; + middle = g_utf8_next_char (middle); if (*middle == '\0') return; @@ -536,6 +538,8 @@ e_name_western_get_suffix_at_str_end (char *str) word = e_name_western_get_preceding_word (str, p - str); nextp = p - strlen (word); + if (nextp == str) + break; nextp = g_utf8_prev_char (nextp); e_name_western_cleanup_string (& word); -- cgit