From 4fdc6387c3c8fec13638c694022fdf67e6ea896b Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sat, 8 Apr 2006 01:23:23 +0000 Subject: [PATCH] Fixed segv --- g10/ChangeLog | 5 +++++ g10/mainproc.c | 6 ++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/g10/ChangeLog b/g10/ChangeLog index fbb20c461..b55b7e02e 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,3 +1,8 @@ +2006-04-08 Werner Koch + + * mainproc.c (list_node): Print ring trust value only if not empty + and --with-colons has been given. + 2006-04-05 Werner Koch * getkey.c (user_id_not_found_utf8): New. diff --git a/g10/mainproc.c b/g10/mainproc.c index 38f57b151..cb4432a44 100644 --- a/g10/mainproc.c +++ b/g10/mainproc.c @@ -937,10 +937,12 @@ list_node( CTX c, KBNODE node ) putchar('\n'); if( opt.fingerprint && !any ) print_fingerprint( pk, NULL, 0 ); - if( node->next + if( opt.with_colons + && node->next && node->next->pkt->pkttype == PKT_RING_TRUST ) { printf("rtv:2:%u:\n", - node->next->pkt->pkt.ring_trust->trustval ); + node->next->pkt->pkt.ring_trust? + node->next->pkt->pkt.ring_trust->trustval : 0); } any=1; }