mrc0mmand / rpms / hivex

Forked from rpms/hivex 3 years ago
Clone

Blame SOURCES/0002-Win-Hivex-Regedit-Ignore-comments.patch

ae2b02
From 003028c3c0d33e952430d3f4e1a987a777674eb3 Mon Sep 17 00:00:00 2001
ae2b02
From: Vladimir Panteleev <git@thecybershadow.net>
ae2b02
Date: Thu, 16 Jan 2020 12:11:21 +0000
ae2b02
Subject: [PATCH 2/2] Win::Hivex::Regedit: Ignore comments
ae2b02
ae2b02
---
ae2b02
 perl/lib/Win/Hivex/Regedit.pm | 6 +++---
ae2b02
 1 file changed, 3 insertions(+), 3 deletions(-)
ae2b02
ae2b02
diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm
ae2b02
index 2b17036..f0dbb50 100644
ae2b02
--- a/perl/lib/Win/Hivex/Regedit.pm
ae2b02
+++ b/perl/lib/Win/Hivex/Regedit.pm
ae2b02
@@ -153,8 +153,8 @@ sub reg_import
ae2b02
         #print STDERR "reg_import: parsing <<<$_>>>\n";
ae2b02
 
ae2b02
         if ($state eq "outer") {
ae2b02
-            # Ignore blank lines, headers.
ae2b02
-            next if /^\s*$/;
ae2b02
+            # Ignore blank lines, headers, comments.
ae2b02
+            next if /^\s*(;.*)?$/;
ae2b02
 
ae2b02
             # .* is needed before Windows Registry Editor Version.. in
ae2b02
             # order to eat a possible Unicode BOM which regedit writes
ae2b02
@@ -193,7 +193,7 @@ sub reg_import
ae2b02
                 my $value = _parse_value ("", $1, $encoding);
ae2b02
                 croak (_parse_error ($_, $lineno)) unless defined $value;
ae2b02
                 push @newvalues, $value;
ae2b02
-            } elsif (/^\s*$/) { # blank line after values
ae2b02
+            } elsif (/^\s*(;.*)?$/) { # blank line after values
ae2b02
                 _merge_node ($hmap, \%params, $newnode, \@newvalues, \@delvalues);
ae2b02
                 $state = "outer";
ae2b02
             } else {
ae2b02
-- 
ae2b02
2.24.1
ae2b02