From 6637b11d67d5dacc36ceb5b5a6b525dca65a58c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jindra=20Pet=C5=99=C3=ADk?= Date: Mon, 4 Jan 2021 18:35:47 +0100 Subject: [PATCH] Correct line matching in debugger of AS3 after using deobfuscation --- CHANGELOG.md | 1 + .../flash/abc/avm2/instructions/AVM2Instruction.java | 3 +++ 2 files changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 008805677..d35f96af8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ All notable changes to this project will be documented in this file. - Scaling - Distorted images/canvas on Hi-dpi monitors for Java 9 and later - Radial gradients focal point reading/writing - Correct AS/P-code matching in editor for AS3 after using deobfuscation +- Correct line matching in debugger of AS3 after using deobfuscation ## [11.3.0] - 2020-04-25 ### Added diff --git a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java index 3945488fc..a29e5b64d 100644 --- a/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java +++ b/libsrc/ffdec_lib/src/com/jpexs/decompiler/flash/abc/avm2/instructions/AVM2Instruction.java @@ -72,6 +72,9 @@ public class AVM2Instruction implements Cloneable, GraphSourceItem { @Override public long getLineOffset() { + if (virtualAddress > -1) { + return virtualAddress; + } return getAddress(); }