* Fixes NB#103682, correctly select the default region

* Fixes NB#104978, crash in fill_providers

pmo-trunk-r8050

diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c
index 8e986a5..26b560d 100644 (file)
--- a/src/hildon2/modest-country-picker.c
+++ b/src/hildon2/modest-country-picker.c
@@ -167,6 +167,9 @@ parse_mcc_mapping_line (const char* line,  char** country)
 
        /* Go to the first tab (Country separator) */
        tab = g_utf8_strrchr (line, -1, '\t');
+       if (!tab)
+               return 0;
+
        *country = g_utf8_find_next_char (tab, NULL);
 
        /* Replace by end of string. We need to use strlen, because