===================================================================
RCS file: /cvs/palm/Palm-Keyring/lib/Palm/Keyring.pm,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- palm/Palm-Keyring/lib/Palm/Keyring.pm	2007/01/28 00:18:46	1.12
+++ palm/Palm-Keyring/lib/Palm/Keyring.pm	2007/01/28 18:13:28	1.13
@@ -8,7 +8,7 @@
 #
 #   This started as Memo.pm, I just made it work for Keyring.
 #
-# $RedRiver: Keyring.pm,v 1.11 2007/01/27 23:59:29 andrew Exp $
+# $RedRiver: Keyring.pm,v 1.12 2007/01/28 00:18:46 andrew Exp $
 
 use strict;
 package Palm::Keyring;
@@ -26,7 +26,7 @@
 
 
 # One liner, to allow MakeMaker to work.
-$VERSION = do { my @r = (q$Revision: 1.12 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
+$VERSION = do { my @r = (q$Revision: 1.13 $ =~ /\d+/g); sprintf "%d."."%02d" x $#r, @r };
 
 @ISA = qw( Palm::StdAppInfo Palm::Raw );
 
@@ -260,8 +260,15 @@
 
 	$self->{digest} ||= _calc_keys($self->{password});
 
+	my $recordcount = 0;
 	foreach my $record (@{ $self->{records} }) {
-		next unless defined $record->{data};
+		$recordcount++;
+		# always skip the first record that has the password in it.
+		next if $recordcount <= 1;
+		unless (defined $record->{data}) {
+			warn "Invalid record " . ($recordcount - 1) . "\n";
+			next;
+		}
 
 		my ($name, $encrypted) = split /\000/, $record->{data}, 2;
 		next unless $encrypted;