diff --git a/RecentActivity/release/rr-full/plugins/lsasecrets.pl b/RecentActivity/release/rr-full/plugins/lsasecrets.pl index 399ba6519e..c4b195432e 100755 --- a/RecentActivity/release/rr-full/plugins/lsasecrets.pl +++ b/RecentActivity/release/rr-full/plugins/lsasecrets.pl @@ -49,23 +49,30 @@ sub pluginmain { eval { ::rptMsg(""); ::rptMsg("Domain secret - \$MACHINE\.ACC"); - my $c = $key->get_subkey("\$MACHINE\.ACC\\CupdTime")->get_value("")->get_data(); - my @v = unpack("VV",$c); - my $cupd = gmtime(::getTime($v[0],$v[1])); - ::rptMsg("CupdTime = ".$cupd); + my $v1 = $key->get_subkey("\$MACHINE\.ACC\\CupdTime")->get_value(""); + if (defined $v1) { + my $c = $v1->get_data(); + my @v = unpack("VV",$c); + my $cupd = gmtime(::getTime($v[0],$v[1])); + ::rptMsg("CupdTime = ".$cupd); + } + else { + ::rptMsg("CupdTime value not found"); + } - my $o = $key->get_subkey("\$MACHINE\.ACC\\OupdTime")->get_value("")->get_data(); - my @v = unpack("VV",$c); - my $oupd = gmtime(::getTime($v[0],$v[1])); - ::rptMsg("OupdTime = ".$oupd); + + $v1 = $key->get_subkey("\$MACHINE\.ACC\\OupdTime")->get_value("") + if (defined $v1) { + my $c = $v1->get_data(); + my @v = unpack("VV",$c); + my $oupd = gmtime(::getTime($v[0],$v[1])); + ::rptMsg("OupdTime = ".$oupd); + } + else { + ::rptMsg("OupdTime value not found"); + } }; ::rptMsg("Error: ".$@) if ($@); - - - - - - } else { ::rptMsg($key_path." not found."); diff --git a/RecentActivity/release/rr-full/plugins/productpolicy.pl b/RecentActivity/release/rr-full/plugins/productpolicy.pl index 80948e1ff2..daf4b96acf 100755 --- a/RecentActivity/release/rr-full/plugins/productpolicy.pl +++ b/RecentActivity/release/rr-full/plugins/productpolicy.pl @@ -69,29 +69,32 @@ sub pluginmain { my $key; my $key_path = "ControlSet00".$curr."\\Control\\ProductOptions"; if ($key = $root_key->get_subkey($key_path)) { - my $prod; eval { - $prod = $key->get_value("ProductPolicy")->get_data(); + my $v1 = $key->get_value("ProductPolicy"); + if (defined $v1) { + my $prod = $v1->get_data(); + my %pol = parseData($prod); + ::rptMsg(""); + ::rptMsg("Note: This plugin applies to Vista and Windows 2008 ONLY."); + ::rptMsg("For a listing of names and values, see:"); + ::rptMsg("http://www.geoffchappell.com/viewer.htm?doc=notes/windows/license/install.htm&tx=3,5,6;4"); + ::rptMsg(""); + foreach my $p (sort keys %pol) { + ::rptMsg($p." - ".$pol{$p}); + } + + if (exists $prodinfo{$pol{"Kernel\-ProductInfo"}}) { + ::rptMsg(""); + ::rptMsg("Kernel\-ProductInfo = ".$prodinfo{$pol{"Kernel\-ProductInfo"}}); + } + } + else { + ::rptMsg("Error getting ProductPolicy value"); + } }; if ($@) { ::rptMsg("Error getting ProductPolicy value: $@"); } - else { - my %pol = parseData($prod); - ::rptMsg(""); - ::rptMsg("Note: This plugin applies to Vista and Windows 2008 ONLY."); - ::rptMsg("For a listing of names and values, see:"); - ::rptMsg("http://www.geoffchappell.com/viewer.htm?doc=notes/windows/license/install.htm&tx=3,5,6;4"); - ::rptMsg(""); - foreach my $p (sort keys %pol) { - ::rptMsg($p." - ".$pol{$p}); - } - - if (exists $prodinfo{$pol{"Kernel\-ProductInfo"}}) { - ::rptMsg(""); - ::rptMsg("Kernel\-ProductInfo = ".$prodinfo{$pol{"Kernel\-ProductInfo"}}); - } - } } else { ::rptMsg($key_path." not found."); diff --git a/RecentActivity/release/rr-full/plugins/skype.pl b/RecentActivity/release/rr-full/plugins/skype.pl index 3c83bc65f1..aac6de219c 100755 --- a/RecentActivity/release/rr-full/plugins/skype.pl +++ b/RecentActivity/release/rr-full/plugins/skype.pl @@ -45,13 +45,17 @@ sub pluginmain { ::rptMsg("LastWrite Time ".gmtime($key->get_timestamp())." (UTC)"); ::rptMsg(""); - my $install; eval { - $install = $key->get_subkey("Installer")->get_value("DonwloadLastModified")->get_data(); - ::rptMsg("DonwloadLastModified = ".$install); + my $v1 = $install = $key->get_subkey("Installer")->get_value("DonwloadLastModified"); + if (defined $v1) { + my $install = $v1->get_data() + ::rptMsg("DonwloadLastModified = ".$install); + } + else { + ::rptMsg("DonwloadLastModified value not found"); + } }; ::rptMsg("DonwloadLastModified value not found: ".$@) if ($@); - } else { ::rptMsg($key_path." not found.");