Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use pack('S*') instead of .chr so full utf-16 can be supported #283

Closed
wants to merge 3 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 3 additions & 7 deletions lib/winrm/psrp/message_data/pipeline_output.rb
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,9 @@ def extract_out_string(text)
doc.root.get_elements('//S').map do |node|
text = ''
if node.text
text << node.text.gsub(/_x(\h\h\h\h)_/) do
decoded_text = Regexp.last_match[1].hex.chr.force_encoding('utf-8')
if decoded_text.respond_to?(:scrub)
decoded_text.scrub
else
decoded_text.encode('utf-16', invalid: :replace, undef: :replace).encode('utf-8')
end
text << node.text.gsub(/(_x\h\h\h\h_)+/) do |match|
match.scan(/_x(\h\h\h\h)_/).flatten.map(&:hex)
.pack('S*').force_encoding('utf-16le').encode('utf-8')
end.chomp
end
text << "\r\n"
Expand Down