dorkbox/SystemTray
2
1
Fork 1
Code Issues Pull Requests Releases 5 Wiki Activity

preverification for methods

Browse Source
This commit is contained in:
nathan 2017-06-25 23:48:35 +02:00
parent 69db7215b4
commit c70c96b5d9
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/dorkbox/systemTray/util/SystemTrayFixes.java
View File

@ -27,6 +27,7 @@ import dorkbox.util.OS;
import javassist.ClassPool; import javassist.ClassPool;
import javassist.CtBehavior; import javassist.CtBehavior;
import javassist.CtClass; import javassist.CtClass;
import javassist.CtConstructor;
import javassist.CtField; import javassist.CtField;
import javassist.CtMethod; import javassist.CtMethod;
import javassist.CtNewMethod; import javassist.CtNewMethod;
@ -144,12 +145,14 @@ class SystemTrayFixes {
trayClass.getConstructors()[0].setModifiers(trayClass.getConstructors()[0].getModifiers() & javassist.Modifier.PUBLIC); trayClass.getConstructors()[0].setModifiers(trayClass.getConstructors()[0].getModifiers() & javassist.Modifier.PUBLIC);
CtBehavior methodInfos[] = new CtBehavior[]{ CtMethod method = trayClass.getDeclaredMethod("getTrayIconSize");
trayClass.getDeclaredMethod("getTrayIconSize") CtBehavior methodInfos[] = new CtBehavior[]{ method };
};
fixTraySize(methodInfos, trayIconSize); fixTraySize(methodInfos, trayIconSize);
// perform pre-verification for the modified method
method.getMethodInfo().rebuildStackMapForME(trayClass.getClassPool());
trayBytes = trayClass.toBytecode(); trayBytes = trayClass.toBytecode();
} }
@ -219,6 +222,10 @@ class SystemTrayFixes {
"}" + "}" +
"}"); "}");
// perform pre-verification for the modified method
ctMethodCreate.getMethodInfo().rebuildStackMapForME(trayIconClass.getClassPool());
ctMethodUpdate.getMethodInfo().rebuildStackMapForME(trayIconClass.getClassPool());
trayIconBytes = trayIconClass.toBytecode(); trayIconBytes = trayIconClass.toBytecode();
} }
@ -397,6 +404,9 @@ class SystemTrayFixes {
"}" + "}" +
"}"); "}");
// perform pre-verification for the modified method
ctMethodGet.getMethodInfo().rebuildStackMapForME(trayClass.getClassPool());
mouseEventBytes = trayClass.toBytecode(); mouseEventBytes = trayClass.toBytecode();
// whoosh, past the classloader and directly into memory. // whoosh, past the classloader and directly into memory.
@ -490,14 +500,21 @@ class SystemTrayFixes {
// Since, looking at the source code, there is NO other case where the number 24 is used (except for size), we just // Since, looking at the source code, there is NO other case where the number 24 is used (except for size), we just
// bytecode replace 24 with our specified size. // bytecode replace 24 with our specified size.
CtBehavior methodInfos[] = new CtBehavior[]{ CtConstructor constructor = trayIconClass.getDeclaredConstructors()[0]; // only 1 constructor
trayIconClass.getDeclaredConstructors()[0], // only 1 constructor CtMethod method1 = trayIconClass.getDeclaredMethod("getBounds");
trayIconClass.getDeclaredMethod("getBounds"), CtMethod method2 = trayPeerClass.getDeclaredMethod("getTrayIconSize");
trayPeerClass.getDeclaredMethod("getTrayIconSize")
CtBehavior methodInfos[] = new CtBehavior[]{constructor,
method1, method2
}; };
fixTraySize(methodInfos, trayIconSize); fixTraySize(methodInfos, trayIconSize);
// perform pre-verification for the modified method
constructor.getMethodInfo().rebuildStackMapForME(trayIconClass.getClassPool());
method1.getMethodInfo().rebuildStackMapForME(trayIconClass.getClassPool());
method2.getMethodInfo().rebuildStackMapForME(trayPeerClass.getClassPool());
trayIconBytes = trayIconClass.toBytecode(); trayIconBytes = trayIconClass.toBytecode();
trayPeerBytes = trayPeerClass.toBytecode(); trayPeerBytes = trayPeerClass.toBytecode();
@ -525,6 +542,9 @@ class SystemTrayFixes {
"super.setVisible(b);" + "super.setVisible(b);" +
" }", eFrameClass); " }", eFrameClass);
eFrameClass.addMethod(methodVisible); eFrameClass.addMethod(methodVisible);
methodVisible.getMethodInfo().rebuildStackMapForME(eFrameClass.getClassPool());
eFrameBytes = eFrameClass.toBytecode(); eFrameBytes = eFrameClass.toBytecode();
} }
@ -544,7 +564,8 @@ class SystemTrayFixes {
private static private static
void fixTraySize(final CtBehavior[] behaviors, final int traySize) { void fixTraySize(final CtBehavior[] behaviors, final int traySize) {
for (CtBehavior behavior : behaviors) { for (CtBehavior behavior : behaviors) {
CodeIterator methodIterator = behavior.getMethodInfo().getCodeAttribute().iterator(); MethodInfo methodInfo = behavior.getMethodInfo();
CodeIterator methodIterator = methodInfo.getCodeAttribute().iterator();
while (methodIterator.hasNext()) { while (methodIterator.hasNext()) {
int index; int index;