sync with 0.9.0cvs1

[claws.git] / src / compose.c

diff --git a/src/compose.c b/src/compose.c
index d2f40f4ada7104a349f6c1d45333154773094988..da9b4dabcaeb3a8dac50b8fe3515a3232dd97116 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -1911,7 +1911,11 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
                else
                        tmp = g_strdup(compose->sig_str);
 
-               pos = gtkut_stext_find(text, 0, tmp, TRUE);
+               if (tmp[0] == '\0')
+                       pos = -1;
+               else
+                       pos = gtkut_stext_find(text, 0, tmp, TRUE);
+
                if (pos != -1) {
                        len = get_mbs_len(tmp);
                        if (len >= 0) {
@@ -1938,6 +1942,8 @@ static void compose_insert_sig(Compose *compose, gboolean replace)
 
        g_free(compose->sig_str);
        compose->sig_str = compose_get_signature_str(compose);
+       if (!compose->sig_str)
+               compose->sig_str = g_strdup("");
 
        gtk_stext_insert(text, NULL, NULL, NULL, compose->sig_str, -1);
 
@@ -1983,6 +1989,8 @@ static gchar *compose_get_signature_str(Compose *compose)
                gchar *tmp;
 
                tmp = file_read_to_str(sig_file);
+               if (!tmp)
+                       return NULL;
                sig_str = normalize_newlines(tmp);
                g_free(tmp);
        }