(PUP-2738) Windows::File use FFI::Pointer helper

- Remove custom packing of array bytes and replace with use of read_wide_string from FFI::Pointer
kotter · Jun 18, 2014 · b5267d1 · b5267d1
1 parent fdffe84
commit b5267d1
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/puppet/util/windows/file.rb b/lib/puppet/util/windows/file.rb
@@ -205,8 +205,8 @@ def self.resolve_symlink(handle)
       offset = reparse_data[:PrintNameOffset]
       length = reparse_data[:PrintNameLength]
 
-      path = reparse_data[:PathBuffer].to_a[offset, length].pack('C*')
-      path = path.force_encoding('UTF-16LE').encode(Encoding.default_external)
+      ptr = reparse_data.pointer + reparse_data.offset_of(:PathBuffer) + offset
+      path = ptr.read_wide_string(length / 2) # length is bytes, need UTF-16 wchars
     end
 
     path