eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 08:14:09 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

C/Wasm: fix heap corruption when GC hits on initializing stack trace of exception

Browse Source
This commit is contained in:
Alexey Andreev 2019-10-28 13:59:03 +03:00
parent 4f9567561c
commit 6ed00f1af2
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
classlib/src/main/java/org/teavm/classlib/java/lang/TThrowable.java
View File

@ -22,7 +22,6 @@ import org.teavm.classlib.java.util.TArrays;
import org.teavm.interop.Remove; import org.teavm.interop.Remove;
import org.teavm.interop.Rename; import org.teavm.interop.Rename;
import org.teavm.interop.Superclass; import org.teavm.interop.Superclass;
import org.teavm.interop.Unmanaged;
import org.teavm.runtime.ExceptionHandling; import org.teavm.runtime.ExceptionHandling;
@Superclass("java.lang.Object") @Superclass("java.lang.Object")
@ -104,16 +103,11 @@ public class TThrowable extends RuntimeException {
@Override @Override
public Throwable fillInStackTrace() { public Throwable fillInStackTrace() {
if (PlatformDetector.isLowLevel()) { if (PlatformDetector.isLowLevel()) {
stackTrace = fillInStackTraceLowLevel(); stackTrace = (TStackTraceElement[]) (Object) ExceptionHandling.fillStackTrace();
} }
return this; return this;
} }
@Unmanaged
private static TStackTraceElement[] fillInStackTraceLowLevel() {
return (TStackTraceElement[]) (Object) ExceptionHandling.fillStackTrace();
}
@Rename("getMessage") @Rename("getMessage")
public String getMessage0() { public String getMessage0() {
return message; return message;

8
core/src/main/java/org/teavm/model/lowlevel/ExceptionHandlingShadowStackContributor.java
View File

@ -67,6 +67,8 @@ import org.teavm.runtime.ExceptionHandling;
import org.teavm.runtime.ShadowStack; import org.teavm.runtime.ShadowStack;
public class ExceptionHandlingShadowStackContributor { public class ExceptionHandlingShadowStackContributor {
private static final MethodReference FILL_STACK_TRACE = new MethodReference(ExceptionHandling.class,
"fillStackTrace", StackTraceElement[].class);
private Characteristics characteristics; private Characteristics characteristics;
private List<CallSiteDescriptor> callSites; private List<CallSiteDescriptor> callSites;
private BasicBlock defaultExceptionHandler; private BasicBlock defaultExceptionHandler;
@ -281,7 +283,11 @@ public class ExceptionHandlingShadowStackContributor {
|| insn instanceof NullCheckInstruction || insn instanceof BoundCheckInstruction) { || insn instanceof NullCheckInstruction || insn instanceof BoundCheckInstruction) {
return true; return true;
} else if (insn instanceof InvokeInstruction) { } else if (insn instanceof InvokeInstruction) {
return isManagedMethodCall(characteristics, ((InvokeInstruction) insn).getMethod()); MethodReference method = ((InvokeInstruction) insn).getMethod();
if (method.equals(FILL_STACK_TRACE)) {
return true;
}
return isManagedMethodCall(characteristics, method);
} }
return false; return false;
} }