Merge pull request #8533 from Dorin-Pleava/PUP-10943/corrupeted_registry_main

(PUP-10943) Puppet read registry until WCHAR_NULL

Author: gimmyxd

lib/puppet/ffi/windows/api_types.rb

@@ -20,7 +20,7 @@ def attach_function_private(*args)
 
     class ::FFI::Pointer
       NULL_HANDLE = 0
-      WCHAR_NULL = "\0\0".encode('UTF-16LE').freeze
+      WCHAR_NULL = "\0\0".force_encoding('UTF-16LE').freeze
 
       def self.from_string_to_wide_string(str, &block)
         str = Puppet::Util::Windows::String.wide_string(str)

spec/integration/util/windows/registry_spec.rb

@@ -263,6 +263,12 @@ def write_corrupt_dword(reg, valuename)
           type: Win32::Registry::REG_EXPAND_SZ,
           value: "\0\0\0reg expand string",
           expected_value: ""
+        },
+        {
+          name: 'REG_EXPAND_SZ_2',
+          type: Win32::Registry::REG_EXPAND_SZ,
+          value: "1\x002\x003\x004\x00\x00\x00\x90\xD8UoY".force_encoding("UTF-16LE"),
+          expected_value: "1234"
         }
       ].each do |pair|
         it 'reads up to the first wide null' do