Skip to content

Fixed indexOutOfBounds bug when the last bytecode of a function has 0 size #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
onlinecco wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed indexOutOfBounds bug when the last bytecode of a function has 0 size #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added .DS_Store
View file
Open in desktop
Binary file not shown.
14 changes: 12 additions & 2 deletions src/main/scala/cafebabe/CodeHandler.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,13 @@ class CodeHandler private[cafebabe](c: CodeAttributeInfo, cp: ConstantPool, val
} else {
frozen = true

val abcList = abcBuffer.toList
val abcBufferList = abcBuffer.toList

//Add NOP at the end if the last instruction's size is 0 to avoid IndexOutofBounds
val abcList = abcBufferList.last match{
case abc if abc.size == 0 => abcBufferList :+ NOP
case _ => abcBufferList
}
code.maxLocals = locals

val labels : MutableMap[String,Int] = MutableMap.empty
Expand All @@ -108,7 +114,9 @@ class CodeHandler private[cafebabe](c: CodeAttributeInfo, cp: ConstantPool, val
lastLineNumber = ln
lineInfo(pc) = ln
}
case Label(name) => labels(name) = pc
case Label(name) => {
labels(name) = pc
}
case _ => ;
}
pc = pc + abc.size
Expand Down Expand Up @@ -153,6 +161,8 @@ class CodeHandler private[cafebabe](c: CodeAttributeInfo, cp: ConstantPool, val
locally {
var pc = 0
for(abc <- abcList) {
if(pc >= actualSize)
throw CodeFreezingException("Program counter at "+ pc +" exceeds actual size of codeArray " + actualSize, abcList)
codeArray(pc) = abc
pc += abc.size
}
Expand Down