diff options
| author | James Willcox <jwillcox@gnome.org> | 2004-05-20 11:30:29 +0800 |
|---|---|---|
| committer | James Willcox <jwillcox@src.gnome.org> | 2004-05-20 11:30:29 +0800 |
| commit | b2a435d9f208d5401e4561e6f106cae619a27c4f (patch) | |
| tree | 20dc0de5df43b66093627aa64120e88f2ff58f07 | |
| parent | fbf393aa0f5b44a283932f15bbe4d35452a77422 (diff) | |
| download | gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar.gz gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar.bz2 gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar.lz gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar.xz gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.tar.zst gsoc2013-evolution-b2a435d9f208d5401e4561e6f106cae619a27c4f.zip | |
Don't crash when the user presses 'cancel'. Fixes #58733.
2004-05-19 James Willcox <jwillcox@gnome.org>
* lib/e-cert-db.c: (pk11_password):
Don't crash when the user presses 'cancel'. Fixes #58733.
svn path=/trunk/; revision=26005
| -rw-r--r-- | smime/ChangeLog | 6 | ||||
| -rw-r--r-- | smime/lib/e-cert-db.c | 3 |
2 files changed, 9 insertions, 0 deletions
diff --git a/smime/ChangeLog b/smime/ChangeLog index f3749f528b..4a1c33df9d 100644 --- a/smime/ChangeLog +++ b/smime/ChangeLog @@ -1,3 +1,9 @@ +2004-05-19 James Willcox <jwillcox@gnome.org> + + * lib/e-cert-db.c: (pk11_password): + + Don't crash when the user presses 'cancel'. Fixes #58733. + 2004-05-13 Not Zed <NotZed@Ximian.com> * lib/e-cert-db.c (e_cert_db_login_to_slot): call SetPasswordFunc diff --git a/smime/lib/e-cert-db.c b/smime/lib/e-cert-db.c index 6141501f45..5a76619e16 100644 --- a/smime/lib/e-cert-db.c +++ b/smime/lib/e-cert-db.c @@ -155,6 +155,9 @@ pk11_password (PK11SlotInfo* slot, PRBool retry, void* arg) &pwd, &rv); + if (pwd == NULL) + return NULL; + nsspwd = PORT_Strdup (pwd); memset (pwd, 0, strlen (pwd)); g_free (pwd); |