Merge pull request #328 from enebo/desensitize_io_encoding_on_load

Parse.load with an IO/File which has a non-YAML allowed encoding will…

1 files changed, 7 insertions, 0 deletions

diff --git a/ext/java/PsychParser.java b/ext/java/PsychParser.java
index b3e747e..f5b6faf 100644
--- a/ext/java/PsychParser.java
+++ b/ext/java/PsychParser.java
@@ -33,6 +33,8 @@ import java.nio.charset.Charset;
 import java.util.Map;
 
 import org.jcodings.Encoding;
+import org.jcodings.specific.UTF16BEEncoding;
+import org.jcodings.specific.UTF16LEEncoding;
 import org.jcodings.specific.UTF8Encoding;
 import org.jcodings.unicode.UnicodeEncoding;
 import org.jruby.Ruby;
@@ -162,6 +164,11 @@ public class PsychParser extends RubyObject {
             if (yaml instanceof RubyIO) {
                 Encoding enc = ((RubyIO) yaml).getReadEncoding();
                 charset = enc.getCharset();
+
+                // libyaml treats non-utf encodings as utf-8 and hopes for the best.
+                if (!(enc instanceof UTF8Encoding)  && !(enc instanceof UTF16LEEncoding) && !(enc instanceof UTF16BEEncoding)) {
+                    charset = UTF8Encoding.INSTANCE.getCharset();
+                }
             }
             if (charset == null) {
                 // If we can't get it from the IO or it doesn't have a charset, fall back on UTF-8