X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-country-picker.c;h=8309f92cdbdd65f166d8df995db3a2a49206ba09;hp=a05fcf8493bc36cc6198a785386132372ea8c101;hb=5a383a31b2862f9ecface4a3a6fc3235754acb8f;hpb=8f2f2684b452fbee0b5673cd31c7f7404804eef6

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index a05fcf8..8309f92 100644
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -169,9 +169,13 @@ parse_mcc_mapping_line (const char* line,  char** country)
 	tab = g_utf8_strrchr (line, -1, '\t');
 	*country = g_utf8_find_next_char (tab, NULL);
 
-	/* Replace by end of string */
-	final = g_utf8_strrchr (tab, g_utf8_strlen (tab, 100) + 1, '\n');
-	*final = '\0';
+	/* Replace by end of string. We need to use strlen, because
+	   g_utf8_strrchr expects bytes and not UTF8 characters  */
+	final = g_utf8_strrchr (tab, strlen (tab) + 1, '\n');
+	if (G_LIKELY (final))
+		*final = '\0';
+	else
+		tab[strlen(tab) - 1] = '\0';
 
 	/* Get MCC code */
 	mcc[0] = g_utf8_get_char (line);