aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.ja8
-rw-r--r--src/rfc2015.c8
3 files changed, 18 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index ff9d0ef2..318d8af8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
2006-07-28
+ * src/rfc2015.c: sig_status_for_key(): check the error of
+ gpgme_get_key() (fixes crashes on checking signature).
+
+2006-07-28
+
* src/compose.c
src/messageview.c
src/prefs_common_dialog.c
diff --git a/ChangeLog.ja b/ChangeLog.ja
index 425456dc..47630966 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,9 +1,15 @@
2006-07-28
+ * src/rfc2015.c: sig_status_for_key(): gpgme_get_key() のエラーを
+ チェックするようにした(署名検証時のクラッシュを修正)。
+
+2006-07-28
+
* src/compose.c
src/messageview.c
src/prefs_common_dialog.c
- src/mainwindow.c: added Windows-1257 encoding for Baltic.
+ src/mainwindow.c: バルト言語向けに Windows-1257 エンコーディングを
+ 追加。
2006-07-27
diff --git a/src/rfc2015.c b/src/rfc2015.c
index 8f1d975f..35fff7b2 100644
--- a/src/rfc2015.c
+++ b/src/rfc2015.c
@@ -129,9 +129,13 @@ static void sig_status_for_key(GString *str, gpgme_ctx_t ctx,
{
gpgme_key_t key;
gpgme_user_id_t user;
+ gpgme_error_t err;
- gpgme_get_key(ctx, sig->fpr, &key, 0);
- if (key == NULL || key->uids->uid == NULL) {
+ err = gpgme_get_key(ctx, sig->fpr, &key, 0);
+ if (err || key == NULL || key->uids->uid == NULL) {
+ if (err)
+ debug_print("gpgme_get_key failed: %s\n",
+ gpgme_strerror(err));
g_string_sprintfa(str, "%s\n",
gpgmegtk_sig_status_to_string (sig, FALSE));
if ((sig->fpr != NULL) && (*(sig->fpr) != '\0'))