diff options
| author | Richard Jones <rjones@redhat.com> | 2010-04-28 14:28:27 +0100 |
|---|---|---|
| committer | Richard Jones <rjones@redhat.com> | 2010-04-28 14:28:27 +0100 |
| commit | 81cc08b749bde37f364400c2b983d1e73e8dde21 (patch) | |
| tree | 1a555b5d53c1a9d60aba95a5f9a6bd11653a254f /perl | |
| parent | 19ac2618ddfecb0ce6d98c3cbb2bfa2c3c11135c (diff) | |
| download | hivex-81cc08b749bde37f364400c2b983d1e73e8dde21.tar.gz hivex-81cc08b749bde37f364400c2b983d1e73e8dde21.tar.xz hivex-81cc08b749bde37f364400c2b983d1e73e8dde21.zip | |
regedit: Add implicit nul-termination when importing strings.
When you import a string value like:
"Foo"="Bar"
using Windows regedit program, implicit nul-termination is added
to the value (not the key), so what is stored in the value would
be something like:
hex(1):42,00,61,00,72,00,00,00
where two of the trailing zero bytes come from the implicit
terminator. This corrects the reg_import function so it works
the same way.
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/lib/Win/Hivex/Regedit.pm | 3 | ||||
| -rw-r--r-- | perl/t/560-regedit-import.t | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/perl/lib/Win/Hivex/Regedit.pm b/perl/lib/Win/Hivex/Regedit.pm index 871e5ba..c69fda8 100644 --- a/perl/lib/Win/Hivex/Regedit.pm +++ b/perl/lib/Win/Hivex/Regedit.pm @@ -285,16 +285,19 @@ sub _parse_value $type = 1; $data = _parse_quoted_string ($1); return undef unless defined $data; + $data .= "\0"; # Value strings are implicitly ASCIIZ. $data = encode ($encoding, $data); } elsif (m/^str\(([[:xdigit:]]+)\):(".*")$/) { $type = hex ($1); $data = _parse_quoted_string ($2); return undef unless defined $data; + $data .= "\0"; # Value strings are implicitly ASCIIZ. $data = encode ($encoding, $data); } elsif (m/^(".*")$/) { $type = 1; $data = _parse_quoted_string ($1); return undef unless defined $data; + $data .= "\0"; # Value strings are implicitly ASCIIZ. $data = encode ($encoding, $data); } else { return undef; diff --git a/perl/t/560-regedit-import.t b/perl/t/560-regedit-import.t index b0c5254..163a46e 100644 --- a/perl/t/560-regedit-import.t +++ b/perl/t/560-regedit-import.t @@ -55,7 +55,7 @@ $expected = '[\] [\C] "Key1"=hex(2):48,00,65,00,6c,00,6c,00,6f,00 -"Key2"=hex(2):48,00,65,00,6c,00,6c,00,6f,00 +"Key2"=hex(2):48,00,65,00,6c,00,6c,00,6f,00,00,00 "Key3"=hex(3):48,00,65,00,6c,00,6c,00,6f,00,48,00,65,00,6c,00,6c,00,6f,00 "Key4"=dword:ff123456 @@ -72,11 +72,11 @@ $data = ' $expected = '[\] [\A] -@=hex(1):48,00,65,00,6c,00,6c,00,6f,00 +@=hex(1):48,00,65,00,6c,00,6c,00,6f,00,00,00 [\C] "Key1"=hex(2):48,00,65,00,6c,00,6c,00,6f,00 -"Key2"=hex(2):48,00,65,00,6c,00,6c,00,6f,00 +"Key2"=hex(2):48,00,65,00,6c,00,6c,00,6f,00,00,00 "Key3"=hex(3):48,00,65,00,6c,00,6c,00,6f,00,48,00,65,00,6c,00,6c,00,6f,00 "Key4"=dword:ff123456 |