Raise a RangeError when codepoint is invalid for the default internal…

… enc. Signed-off-by: Charles Oliver Nutter <headius@headius.com>
sgonyea · May 1, 2013 · 1733faa · 1733faa
1 parent d4ef266
commit 1733faa
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/build_lib/jcodings.jar b/build_lib/jcodings.jar
diff --git a/spec/tags/1.9/ruby/core/integer/chr_tags.txt b/spec/tags/1.9/ruby/core/integer/chr_tags.txt
@@ -1,2 +1 @@
-fails:Integer#chr without argument when Encoding.default_internal is not nil and self is greater than 255 raises RangeError if self is invalid as a codepoint in the default internal encoding
 fails:Integer#chr with an encoding argument raises RangeError if self is invalid as a codepoint in the specified encoding
diff --git a/src/org/jruby/RubyInteger.java b/src/org/jruby/RubyInteger.java
@@ -336,11 +336,16 @@ private ByteList fromEncodedBytes(Ruby runtime, Encoding enc, int value) {
         } catch (EncodingException ee) {
             n = 0;
         }
-        
+
         if (n <= 0) throw runtime.newRangeError(this.toString() + " out of char range");
 
         ByteList bytes = new ByteList(n);
-        enc.codeToMbc(value, bytes.getUnsafeBytes(), 0);
+
+        try {
+            enc.codeToMbc(value, bytes.getUnsafeBytes(), 0);
+        } catch (EncodingException e) {
+            throw runtime.newRangeError("invalid codepoint " + String.format("0x%x in ", value) + enc.getCharsetName());
+        }
         bytes.setRealSize(n);
         return bytes;
     }