diff options
| author | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-03-01 06:47:48 +0000 |
|---|---|---|
| committer | hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> | 2007-03-01 06:47:48 +0000 |
| commit | 529d11f93dc27dac180d5726c2f78b45351b1960 (patch) | |
| tree | 5508968a188888a7abc14949957f54ebe47acc33 | |
| parent | c50e4617756ae3f57b349bd149740669d94cf767 (diff) | |
guard against null verify result.
git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@1559 ee746299-78ed-0310-b773-934348b2243d
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ChangeLog.ja | 5 | ||||
| -rw-r--r-- | src/rfc2015.c | 2 | ||||
| -rw-r--r-- | src/sigstatus.c | 3 |
4 files changed, 15 insertions, 0 deletions
@@ -1,3 +1,8 @@ +2007-03-01 + + * src/rfc2015.c + src/sigstatus.c: guard against null verify result. + 2007-02-23 * src/inc.c: inc_remote_account_mail(): count filtered messages for diff --git a/ChangeLog.ja b/ChangeLog.ja index 0588b3a9..ae73cc3f 100644 --- a/ChangeLog.ja +++ b/ChangeLog.ja @@ -1,3 +1,8 @@ +2007-03-01 + + * src/rfc2015.c + src/sigstatus.c: 検証結果が null の場合に対して保護するようにした。 + 2007-02-23 * src/inc.c: inc_remote_account_mail(): 新着通知のために振り分け diff --git a/src/rfc2015.c b/src/rfc2015.c index 4f050d3b..48d178e3 100644 --- a/src/rfc2015.c +++ b/src/rfc2015.c @@ -168,6 +168,8 @@ static gchar *sig_status_full(gpgme_ctx_t ctx, gpgme_verify_result_t result) gchar *ctime_str_utf8; gchar *retval; + g_return_val_if_fail(result != NULL, NULL); + str = g_string_new(""); sig = result->signatures; diff --git a/src/sigstatus.c b/src/sigstatus.c index 5f197a99..5d4cafa1 100644 --- a/src/sigstatus.c +++ b/src/sigstatus.c @@ -190,6 +190,9 @@ void gpgmegtk_sig_status_update(GpgmegtkSigStatus hd, gpgme_ctx_t ctx) if (!hd || !hd->running || !ctx) return; result = gpgme_op_verify_result(ctx); + if (!result) + return; + sig = result->signatures; while (sig) { gchar *tmp; |