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.

Sign up for GitHub

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

Jump to bottom

Improve Encoding handling #111

Merged
merged 1 commit into from
Feb 17, 2022
Merged

Improve Encoding handling #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions lib/execjs/encoding.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ module Encoding
# workaround for jruby bug http://jira.codehaus.org/browse/JRUBY-6588
# workaround for rbx bug https://github.com/rubinius/rubinius/issues/1729
def encode(string)
if string.encoding.name == 'ASCII-8BIT'
if string.encoding == ::Encoding::BINARY
data = string.dup
data.force_encoding('UTF-8')
data.force_encoding(::Encoding::UTF_8)

unless data.valid_encoding?
raise ::Encoding::UndefinedConversionError, "Could not encode ASCII-8BIT data #{string.dump} as UTF-8"
raise ::Encoding::UndefinedConversionError, "Could not encode binary data #{string.dump} as UTF-8"
end
else
data = string.encode('UTF-8')
data = string.encode(::Encoding::UTF_8)
end
data
end
Expand Down