diff options
Diffstat (limited to 'g10')
| -rw-r--r-- | g10/ChangeLog | 5 | ||||
| -rw-r--r-- | g10/keyedit.c | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index ee9a7c8e4..9702f3779 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +Thu Feb 10 17:39:44 CET 2000 Werner Koch <[email protected]> + + * keyedit.c (menu_expire): Fixed segv due to unitialized sub_pk. + By R�mi. + Thu Feb 10 11:39:41 CET 2000 Werner Koch <[email protected]> * keylist.c (list_keyblock): Don't print warnings in the middle of diff --git a/g10/keyedit.c b/g10/keyedit.c index bed757922..a56f55c4e 100644 --- a/g10/keyedit.c +++ b/g10/keyedit.c @@ -1486,7 +1486,8 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ) } else if( node->pkt->pkttype == PKT_USER_ID ) uid = node->pkt->pkt.user_id; - else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE ) { + else if( main_pk && node->pkt->pkttype == PKT_SIGNATURE + && sub_pk != NULL ) { PKT_signature *sig = node->pkt->pkt.signature; if( keyid[0] == sig->keyid[0] && keyid[1] == sig->keyid[1] && ( (mainkey && uid && (sig->sig_class&~3) == 0x10) @@ -1550,6 +1551,7 @@ menu_expire( KBNODE pub_keyblock, KBNODE sec_keyblock ) m_free( sn->pkt ); sn->pkt = newpkt; } + sub_pk = NULL; } } } |