ReVanced/smali
1
0
Fork 0
mirror of https://github.com/revanced/smali.git synced 2025-06-13 04:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix an issue when the current address immediatly after an AdvancePC debug instruction doesn't point to an instruction

Browse Source 
git-svn-id: https://smali.googlecode.com/svn/trunk@515 55b6fa8a-2a1e-11de-a435-ffa8d773f76a
This commit is contained in:
JesusFreke@JesusFreke.com
2009-12-23 23:46:18 +00:00
parent 2ededb89b9
commit 2904f40603
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dexlib/src/main/java/org/jf/dexlib/CodeItem.java
View File

@ -639,6 +639,16 @@ public class CodeItem extends Item<CodeItem> {
} }
int newOffset = newOffsetsByOriginalOffset.get(address*2, -1); int newOffset = newOffsetsByOriginalOffset.get(address*2, -1);
//The address might not point to an actual instruction in some cases, for example, if an AdvancePC
//instruction was inserted just before a "special" instruction, to fix up the offsets for a previous
//instruction replacement.
//In this case, it should be safe to skip, because there will be another AdvancePC/SpecialOpcode that will
//bump up the address to point to a valid instruction before anything (line/local/etc.) is emitted
if (newOffset == -1) {
return;
}
assert newOffset != -1; assert newOffset != -1;
newOffset = newOffset / 2; newOffset = newOffset / 2;