[Pgp-tools-commit] r823 - trunk/gpgsigs

[Guilhem Moulin]

Author: guilhem-guest
Date: 2016-01-31 16:56:52 +0000 (Sun, 31 Jan 2016)
New Revision: 823

Modified:
   trunk/gpgsigs/gpgsigs
Log:
gpgsigs: Ensure that $uid is undefined even when there are no subkeys.

Modified: trunk/gpgsigs/gpgsigs
===================================================================
--- trunk/gpgsigs/gpgsigs	2015-12-15 02:14:19 UTC (rev 822)
+++ trunk/gpgsigs/gpgsigs	2016-01-31 16:56:52 UTC (rev 823)
@@ -169,6 +169,7 @@
 				chomp;
 				undef $sig unless /^spk:/;
 				if (/^pub:([^:]+):(?:[^:]*:){2}([0-9A-F]{16}):(?:[^:]*:){6}([^:]+)/) {
+					undef $uid;
 					$key = $2;
 					if ($1 =~ /[ir]/ or $3 =~ /D/ ) {
 						warn "Ignoring unusable key $key.\n";
@@ -200,7 +201,7 @@
 					push @{$keys{$key}}, $uid; # preserve order
 					next;
 				}
-				next unless $uid; # nothing to do on revoked uids
+				next unless defined $uid; # nothing to do on revoked uids
 				if (/^sig:(?:[^:]*:){3}([0-9A-F]{16}):(\d+):(\d*):(?:[^:]*:){3}(1[0-3][lx])(?::.*)?$/) {
 					if (!grep { $1 =~ /$_$/ or $key =~ /$_$/ } @mykeys) {
 						$sig = []; # $key is not ours, and the signer isn't us: don't waste resources