[svn] GnuPG - r4096 - trunk/g10

[svn author wk]

Author: wk
Date: 2006-04-08 03:23:23 +0200 (Sat, 08 Apr 2006)
New Revision: 4096

Modified:
   trunk/g10/ChangeLog
   trunk/g10/mainproc.c
Log:
Fixed segv


Modified: trunk/g10/ChangeLog
===================================================================
--- trunk/g10/ChangeLog	2006-04-08 00:36:51 UTC (rev 4095)
+++ trunk/g10/ChangeLog	2006-04-08 01:23:23 UTC (rev 4096)
@@ -1,3 +1,8 @@
+2006-04-08  Werner Koch  <wk at g10code.com>
+
+	* mainproc.c (list_node): Print ring trust value only if not empty
+	and --with-colons has been given.
+
 2006-04-05  Werner Koch  <wk at g10code.com>
 
 	* getkey.c (user_id_not_found_utf8): New.

Modified: trunk/g10/mainproc.c
===================================================================
--- trunk/g10/mainproc.c	2006-04-08 00:36:51 UTC (rev 4095)
+++ trunk/g10/mainproc.c	2006-04-08 01:23:23 UTC (rev 4096)
@@ -937,10 +937,12 @@
 		    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;
 		}