ExternalVendorCode/corda
1
0
Fork 0
mirror of https://github.com/corda/corda.git synced 2025-03-17 17:45:17 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

constrain exception handler bounds to bytecode length

Browse Source 
Scala occasionally generates exception handler tables with interval
bounds which fall outside the range of valid bytecode indexes, so we
must clamp them or risk out-of-bounds array accesses.
This commit is contained in:
Joel Dice 2012-03-11 05:00:08 -06:00
parent 71295e54c7
commit 8590695f2d
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compile.cpp
View File

@ -6172,6 +6172,10 @@ logCompile(MyThread* t, const void* code, unsigned size, const char* class_,
int
resolveIpForwards(Context* context, int start, int end)
{
if (start < 0) {
start = 0;
}
while (start < end and context->visitTable[start] == 0) {
++ start;
}
@ -6186,6 +6190,13 @@ resolveIpForwards(Context* context, int start, int end)
int
resolveIpBackwards(Context* context, int start, int end)
{
Thread* t = context->thread;
if (start >= static_cast<int>
(codeLength(t, methodCode(t, context->method))))
{
start = codeLength(t, methodCode(t, context->method)) - 1;
}
while (start >= end and context->visitTable[start] == 0) {
-- start;
}
@ -6269,11 +6280,16 @@ translateExceptionHandlerTable(MyThread* t, Context* context, intptr_t start)
exceptionHandlerEnd(oldHandler));
if (LIKELY(handlerStart >= 0)) {
assert(t, handlerStart < static_cast<int>
(codeLength(t, methodCode(t, context->method))));
int handlerEnd = resolveIpBackwards
(context, exceptionHandlerEnd(oldHandler),
exceptionHandlerStart(oldHandler));
assert(t, handlerEnd >= 0);
assert(t, handlerEnd < static_cast<int>
(codeLength(t, methodCode(t, context->method))));
intArrayBody(t, newIndex, ni * 3)
= c->machineIp(handlerStart)->value() - start;