Detect jump's that are bigger than allowed

jbossas · Jul 18, 2012 · eda6e4f · eda6e4f
1 parent ea4d6e2
commit eda6e4f
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/src/main/java/org/jboss/classfilewriter/code/CodeAttribute.java b/src/main/java/org/jboss/classfilewriter/code/CodeAttribute.java
@@ -301,10 +301,14 @@ public void bipush(byte value) {
      */
     public void branchEnd(BranchEnd end) {
         mergeStackFrames(end.getStackFrame());
+        final int jump = currentOffset - end.getOffsetLocation();
         if (end.isJump32Bit()) {
-            jumpLocations32.put(end.getBranchLocation(), currentOffset - end.getOffsetLocation());
+            jumpLocations32.put(end.getBranchLocation(), jump);
         } else {
-            jumpLocations.put(end.getBranchLocation(), currentOffset - end.getOffsetLocation());
+            if(jump > Short.MAX_VALUE) {
+                throw new RuntimeException(jump + " is to big to be written as a 16 bit value");
+            }
+            jumpLocations.put(end.getBranchLocation(), jump);
         }
     }
 
@@ -2091,6 +2095,9 @@ private void writeByte(int n) {
 
     private void writeShort(int n) {
         try {
+            if(n > Short.MAX_VALUE) {
+                throw new RuntimeException(n + " is to big to be written as a 16 bit value");
+            }
             data.writeShort(n);
         } catch (IOException e) {
             throw new RuntimeException(e);