Fix for ASM issue 317555

jhoeller · jhoeller · commit 2c043ec9d7ad · 2015-05-07T15:41:24.000+02:00
Issue: SPR-12957
diff --git a/spring-core/src/main/java/org/springframework/asm/MethodWriter.java b/spring-core/src/main/java/org/springframework/asm/MethodWriter.java
@@ -2706,11 +2706,13 @@ private void resizeInstructions() {
                 l = l.successor;
             }
             // Update the offsets in the uninitialized types
-            for (i = 0; i < cw.typeTable.length; ++i) {
-                Item item = cw.typeTable[i];
-                if (item != null && item.type == ClassWriter.TYPE_UNINIT) {
-                    item.intVal = getNewOffset(allIndexes, allSizes, 0,
-                            item.intVal);
+            if (cw.typeTable != null) {
+                for (i = 0; i < cw.typeTable.length; ++i) {
+                    Item item = cw.typeTable[i];
+                    if (item != null && item.type == ClassWriter.TYPE_UNINIT) {
+                        item.intVal = getNewOffset(allIndexes, allSizes, 0,
+                                item.intVal);
+                    }
                 }
             }
             // The stack map frames are not serialized yet, so we don't need

Original file line number	Diff line number	Diff line change
`@@ -2706,11 +2706,13 @@ private void resizeInstructions() {`
`2706`	`2706`	`l = l.successor;`
`2707`	`2707`	`}`
`2708`	`2708`	`// Update the offsets in the uninitialized types`
`2709`		`- for (i = 0; i < cw.typeTable.length; ++i) {`
`2710`		`- Item item = cw.typeTable[i];`
`2711`		`- if (item != null && item.type == ClassWriter.TYPE_UNINIT) {`
`2712`		`- item.intVal = getNewOffset(allIndexes, allSizes, 0,`
`2713`		`- item.intVal);`
	`2709`	`+ if (cw.typeTable != null) {`
	`2710`	`+ for (i = 0; i < cw.typeTable.length; ++i) {`
	`2711`	`+ Item item = cw.typeTable[i];`
	`2712`	`+ if (item != null && item.type == ClassWriter.TYPE_UNINIT) {`
	`2713`	`+ item.intVal = getNewOffset(allIndexes, allSizes, 0,`
	`2714`	`+ item.intVal);`
	`2715`	`+ }`
`2714`	`2716`	`}`
`2715`	`2717`	`}`
`2716`	`2718`	`// The stack map frames are not serialized yet, so we don't need`