Fix bug to do invalid cast before check whether value is of int corre…

…ctly or not
msgpack · Sep 8, 2015 · 76ba902 · 76ba902
1 parent 7af6059
commit 76ba902
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ext/java/org/msgpack/jruby/Encoder.java b/ext/java/org/msgpack/jruby/Encoder.java
@@ -339,12 +339,12 @@ private void appendExt(int type, ByteList payloadBytes) {
   }
 
   private void appendExtensionValue(ExtensionValue object) {
-    int type = (int) ((RubyFixnum)object.get_type()).getLongValue();
+    long type = ((RubyFixnum)object.get_type()).getLongValue();
     if (type < -128 || type > 127) {
 	    throw object.getRuntime().newRangeError(String.format("integer %d too big to convert to `signed char'", type));
     }
     ByteList payloadBytes = ((RubyString)object.payload()).getByteList();
-    appendExt(type, payloadBytes);
+    appendExt((int) type, payloadBytes);
   }
 
   private void appendOther(IRubyObject object, IRubyObject destination) {

diff --git a/ext/java/org/msgpack/jruby/Factory.java b/ext/java/org/msgpack/jruby/Factory.java
@@ -95,7 +95,7 @@ public IRubyObject registerType(ThreadContext ctx, IRubyObject[] args) {
       throw runtime.newArgumentError(String.format("wrong number of arguments (%d for 2..3)", 2 + args.length));
     }
 
-    int typeId = (int) ((RubyFixnum) type).getLongValue();
+    long typeId = ((RubyFixnum) type).getLongValue();
     if (typeId < -128 || typeId > 127) {
       throw runtime.newRangeError(String.format("integer %d too big to convert to `signed char'", typeId));
     }
@@ -118,8 +118,8 @@ public IRubyObject registerType(ThreadContext ctx, IRubyObject[] args) {
       }
     }
 
-    this.packerExtRegistry.put(extClass, typeId, packerProc, packerArg);
-    this.unpackerExtRegistry.put(extClass, typeId, unpackerProc, unpackerArg);
+    this.packerExtRegistry.put(extClass, (int) typeId, packerProc, packerArg);
+    this.unpackerExtRegistry.put(extClass, (int) typeId, unpackerProc, unpackerArg);
 
     return runtime.getNil();
   }