376351

1 files changed, 3 insertions, 3 deletions

diff --git a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
index 87b0f6b95..07477d1a9 100644
--- a/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
+++ b/weaver/src/org/aspectj/weaver/bcel/asm/StackMapAdder.java
@@ -30,7 +30,7 @@ public class StackMapAdder {
 	public static byte[] addStackMaps(World world, byte[] data) {
 		try {
 			ClassReader cr = new ClassReader(data);
-			ClassWriter cw = new AspectJConnectClassWriter(world);
+			ClassWriter cw = new AspectJConnectClassWriter(cr, world);
 			cr.accept(cw, 0);
 			return cw.toByteArray();
 		} catch (Throwable t) {
@@ -43,8 +43,8 @@ public class StackMapAdder {
 	private static class AspectJConnectClassWriter extends ClassWriter {
 		private final World world;
 
-		public AspectJConnectClassWriter(World w) {
-			super(ClassWriter.COMPUTE_FRAMES);
+		public AspectJConnectClassWriter(ClassReader cr, World w) {
+			super(cr, ClassWriter.COMPUTE_FRAMES); // passing in cr is necessary so cpool isnt modified (see 2.2.4 of asm doc)
 			this.world = w;
 		}