* Fixes NB#90985, adds a safety check and replaces a function call by a safer one

[modest] / src / modest-account-mgr-helpers.c

diff --git a/src/modest-account-mgr-helpers.c b/src/modest-account-mgr-helpers.c
index 989663d..0d8245b 100644 (file)
--- a/src/modest-account-mgr-helpers.c
+++ b/src/modest-account-mgr-helpers.c
@@ -818,6 +818,8 @@ modest_account_mgr_get_from_string (ModestAccountMgr *self, const gchar* name)
 static gchar*
 util_increment_name (const gchar* text)
 {
+       g_return_val_if_fail (text, NULL);
+
        /* Get the end character,
         * also doing a UTF-8 validation which is required for using g_utf8_prev_char().
         */
@@ -842,7 +844,7 @@ util_increment_name (const gchar* text)
                        break;
                }
                
-               p = g_utf8_prev_char (p);       
+               p = g_utf8_find_prev_char (text, p);    
        }
        
        if(!alpha_end) {