zaaarf/lillero
2
1
Fork 0
mirror of https://github.com/zaaarf/lillero.git synced 2024-09-19 18:24:08 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: nullptr in PatternMatcher

Browse source
This commit is contained in:
zaaarf 2023-04-13 18:36:05 +02:00
parent dd09c4f8e1
commit 05c9f6c3a2
No known key found for this signature in database
GPG key ID: 82240E075E31FA4C
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/ftbsc/lll/tools/PatternMatcher.java
View file

@ -83,11 +83,10 @@ public class PatternMatcher {
if(predicates.size() == 0) return new InsnSequence(cur); //match whatever if(predicates.size() == 0) return new InsnSequence(cur); //match whatever
first = cur; first = cur;
last = cur; last = cur;
for(int match = 0; match < predicates.size(); last = reverse ? last.getPrevious() : last.getNext()) { for(int match = 0; last != null && match < predicates.size(); last = reverse ? last.getPrevious() : last.getNext()) {
if(ignoreLabels && cur.getType() == AbstractInsnNode.LABEL) continue; if(ignoreLabels && cur.getType() == AbstractInsnNode.LABEL) continue;
if(ignoreFrames && cur.getType() == AbstractInsnNode.FRAME) continue; if(ignoreFrames && cur.getType() == AbstractInsnNode.FRAME) continue;
if(ignoreLineNumbers && cur.getType() == AbstractInsnNode.LINE) continue; if(ignoreLineNumbers && cur.getType() == AbstractInsnNode.LINE) continue;
if(last == null) break;
if(!predicates.get(match).test(last)) break; if(!predicates.get(match).test(last)) break;
if(match == predicates.size() - 1) { if(match == predicates.size() - 1) {
if(reverse) return new InsnSequence(last, first); //we are matching backwards if(reverse) return new InsnSequence(last, first); //we are matching backwards