diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-06-10 04:52:07 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2005-06-10 04:52:07 +0000 |
| commit | 48f1078ba5251ebe3bdd07765c94d1f38bc87900 (patch) | |
| tree | 2da9e680142746e637997db8878aef021b9083a4 | |
| parent | 7767bbd587b22cdbf3be3362fb32dedb1185ea4c (diff) | |
fixed possible crash when sorted by From/To/Subject.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@328 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/summaryview.c | 6 |
3 files changed, 16 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2005-06-10 + + * src/summaryview.c: fixed possible crash when sorted by + From/To/Subject. + 2005-06-09 * version 2.0.0beta1 diff --git a/ChangeLog.ja b/ChangeLog.ja index aa16fc50..0d8c7a53 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2005-06-10 + + * src/summaryview.c: From/To/Subject でソートしたときにクラッシュする + 可能性があったのを修正。 + 2005-06-09 * version 2.0.0beta1 diff --git a/src/summaryview.c b/src/summaryview.c index 973794a5..34e758eb 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -4740,6 +4740,9 @@ static gint func_name(GtkTreeModel *model, \ gtk_tree_model_get(model, a, S_COL_MSG_INFO, &msginfo_a, -1); \ gtk_tree_model_get(model, b, S_COL_MSG_INFO, &msginfo_b, -1); \ \ + if (!msginfo_a || !msginfo_b) \ + return 0; \ + \ if (msginfo_a->var_name == NULL) \ return -(msginfo_b->var_name != NULL); \ if (msginfo_b->var_name == NULL) \ @@ -4762,6 +4765,9 @@ static gint summary_cmp_by_subject(GtkTreeModel *model, \ gtk_tree_model_get(model, a, S_COL_MSG_INFO, &msginfo_a, -1); \ gtk_tree_model_get(model, b, S_COL_MSG_INFO, &msginfo_b, -1); \ \ + if (!msginfo_a || !msginfo_b) \ + return 0; \ + \ if (msginfo_a->subject == NULL) \ return -(msginfo_b->subject != NULL); \ if (msginfo_b->subject == NULL) \ |