admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

Don't choke on invalid UTF-8 in file output

Browse Source 
Sometimes `file` output contains data from the file under examination,
which may include binary data that does not represent valid UTF-8
codepoints. String#split dies if it doesn't understand the encoding, so
tell Ruby to treat `file` output as a bytestring.
This commit is contained in:
Tim D. Smith 2016-10-15 21:21:08 -07:00
parent 7ac90613fd
commit 371cd0dd3e
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/keg_relocate.rb
View File

@ -84,9 +84,12 @@ class Keg
} }
output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --print0", output, _status = Open3.capture2("/usr/bin/xargs -0 /usr/bin/file --no-dereference --print0",
stdin_data: files.to_a.join("\0")) stdin_data: files.to_a.join("\0"))
# `file` output sometimes contains data from the file, which may include
# invalid UTF-8 entities, so tell Ruby this is just a bytestring
output.force_encoding(Encoding::ASCII_8BIT)
output.each_line do |line| output.each_line do |line|
path, info = line.split("\0") path, info = line.split("\0", 2)
next unless info.to_s.include?("text") next unless info.include?("text")
path = Pathname.new(path) path = Pathname.new(path)
next unless files.include?(path) next unless files.include?(path)
text_files << path text_files << path