jruby · Jan 4, 2016 · Jan 4, 2016
Showing with 12 additions and 1 deletion.

+8 −0 spec/ruby/core/string/unpack/u_spec.rb

+2 −1 truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadUTF8CharacterNode.java

+2 −0 truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
diff --git a/spec/ruby/core/string/unpack/u_spec.rb b/spec/ruby/core/string/unpack/u_spec.rb
@@ -8,6 +8,14 @@
   it_behaves_like :string_unpack_basic, 'U'
   it_behaves_like :string_unpack_no_platform, 'U'
   it_behaves_like :string_unpack_unicode, 'U'
+
+  it "raises ArgumentError on a malformed byte sequence" do
+    lambda { "\xE3".unpack('U') }.should raise_error(ArgumentError)
+  end
+
+  it "raises ArgumentError on a malformed byte sequence and doesn't continue when used with the * modifier" do
+    lambda { "\xE3".unpack('U*') }.should raise_error(ArgumentError)
+  end
 end
 
 describe "String#unpack with format 'u'" do

diff --git a/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadUTF8CharacterNode.java b/truffle/src/main/java/org/jruby/truffle/format/nodes/read/ReadUTF8CharacterNode.java
@@ -17,6 +17,7 @@
 import org.jruby.truffle.format.nodes.PackNode;
 import org.jruby.truffle.format.nodes.SourceNode;
 import org.jruby.truffle.format.runtime.MissingValue;
+import org.jruby.truffle.format.runtime.exceptions.FormatException;
 import org.jruby.truffle.runtime.RubyContext;
 
 import java.nio.ByteBuffer;
@@ -81,7 +82,7 @@ public Object read(VirtualFrame frame, byte[] source) {
         }
 
         if (index + length > sourceLength) {
-            return MissingValue.INSTANCE;
+            throw new FormatException(String.format("malformed UTF-8 character (expected %d bytes, given %d bytes)", length, sourceLength - index));
         }
 
         for (int n = 1; n < length; n++) {

diff --git a/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java b/truffle/src/main/java/org/jruby/truffle/nodes/core/StringNodes.java
@@ -2205,6 +2205,8 @@ public DynamicObject unpackUncached(
         private RuntimeException handleException(PackException exception) {
             try {
                 throw exception;
+            } catch (FormatException e) {
+                return new RaiseException(getContext().getCoreLibrary().argumentError(e.getMessage(), this));
             } catch (TooFewArgumentsException e) {
                 return new RaiseException(getContext().getCoreLibrary().argumentError("too few arguments", this));
             } catch (NoImplicitConversionException e) {