2006-11-13 [colin] 2.6.0cvs41
authorColin Leroy <colin@colino.net>
Mon, 13 Nov 2006 19:43:10 +0000 (19:43 +0000)
committerColin Leroy <colin@colino.net>
Mon, 13 Nov 2006 19:43:10 +0000 (19:43 +0000)
* src/plugins/pgpcore/sgpgme.c
Maybe fix bug 1061, 'crash on opening
signed email'

ChangeLog
PATCHSETS
configure.ac
src/plugins/pgpcore/sgpgme.c

index bdce253f8a64169d2dda2186f4a19c48350fea28..5c603bb3051aa424639f65489af13ab7a613d66e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-11-13 [colin]     2.6.0cvs41
+
+       * src/plugins/pgpcore/sgpgme.c
+               Maybe fix bug 1061, 'crash on opening 
+               signed email'
+
 2006-11-13 [wwp]       2.6.0cvs40
 
        * src/plugins/pgpinline/pgpinline.c
index 9b458dd165ce0191531a5ba9ba5e7f6464cdf8ac..a0aa460c930ff488ab4dde4546875c9fd0af0267 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
 ( cvs diff -u -r 1.58.2.27 -r 1.58.2.28 po/de.po;  ) > 2.6.0cvs38.patchset
 ( cvs diff -u -r 1.382.2.328 -r 1.382.2.329 src/compose.c;  cvs diff -u -r 1.22.2.25 -r 1.22.2.26 src/quote_fmt_parse.y;  ) > 2.6.0cvs39.patchset
 ( cvs diff -u -r 1.1.2.21 -r 1.1.2.22 src/plugins/pgpinline/pgpinline.c;  ) > 2.6.0cvs40.patchset
+( cvs diff -u -r 1.1.2.35 -r 1.1.2.36 src/plugins/pgpcore/sgpgme.c;  ) > 2.6.0cvs41.patchset
index 2d12c24f67f2061c5896788eb29688dbed6ccf5a..344efc3a16d3240a16ec7294cd699d5887c53d5a 100644 (file)
@@ -11,7 +11,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=40
+EXTRA_VERSION=41
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
index 878dbc01dc11051be46010695f9b787024181e17..b92bba5c398936b7bc50d01bfa0f70c950bde0fd 100644 (file)
@@ -187,6 +187,10 @@ gchar *sgpgme_sigstat_info_short(gpgme_ctx_t ctx, gpgme_verify_result_t status)
        if (sig == NULL) {
                return g_strdup(_("The signature has not been checked."));
        }
+       if (sig->fpr == NULL) {
+               g_warning(_("PGP Core: Can't get key fingerprint."));
+               return g_strdup(_("PGP Core: Can't get key fingerprint."));
+       }
 
        err = gpgme_get_key(ctx, sig->fpr, &key, 0);
        if (gpg_err_code(err) == GPG_ERR_NO_AGENT) {