aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2009-02-25 05:42:34 +0000
committerhiro <hiro@ee746299-78ed-0310-b773-934348b2243d>2009-02-25 05:42:34 +0000
commit71b2c3dc0b1eb1059374d1a4f50169af73e0f2fa (patch)
tree719c007a61e4718e45ea4bb31f1dda9c3c702b1a
parent47aac1577bc348326417141ffbcbfd5851757353 (diff)
fixed crash on csv import.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2115 ee746299-78ed-0310-b773-934348b2243d
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja6
-rw-r--r--src/addr_compl.c2
3 files changed, 12 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d2c4dc62..64933991 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-25
+
+ * src/addr_compl.c: add_address(): fixed crash when name == NULL
+ which can happen with csv import (thanks to Simon Effenberg).
+
2008-12-26
* libsylph/procmime.c: procmime_decode_content(): properly process
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 3c7897f7..3e1fb9a6 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2008-02-25
+
+ * src/addr_compl.c: add_address(): name == NULL の場合(csv の
+ インポートで発生する可能性がある)クラッシュするのを修正
+ (Simon Effenberg さん thanks)。
+
2008-12-26
* libsylph/procmime.c: procmime_decode_content(): 8192 バイトを
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 73a5e804..bc2e4817 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -174,7 +174,7 @@ static gint add_address(const gchar *name, const gchar *address, const gchar *ni
addr_ce = g_new0(completion_entry, 1);
ae = g_new0(address_entry, 1);
- ae->name = g_strdup(name);
+ ae->name = g_strdup(name ? name : "");
ae->address = g_strdup(address);
if ((found = g_list_find_custom(address_list, ae,
address_entry_find_func))) {