stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8015814: loadWithNewGlobal needs to wrap createGlobal in AccessController.doPrivileged

Browse Source 
Reviewed-by: sundar
This commit is contained in:
James Laskey 2013-06-03 12:57:53 -03:00 committed by Jim Laskey
parent b73369b1fe
commit fcf3353ddf
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
nashorn/src/jdk/nashorn/internal/runtime/Context.java
View File

@ -500,9 +500,21 @@ public final class Context {
*
* @throws IOException if source cannot be found or loaded
*/
public Object loadWithNewGlobal(final Object from) throws IOException {
public Object loadWithNewGlobal(final Object from) throws IOException, RuntimeException {
final ScriptObject oldGlobal = getGlobalTrusted();
final ScriptObject newGlobal = createGlobal();
final ScriptObject newGlobal = AccessController.doPrivileged(new PrivilegedAction<ScriptObject>() {
@Override
public ScriptObject run() {
try {
return createGlobal();
} catch (final RuntimeException e) {
if (Context.DEBUG) {
e.printStackTrace();
}
throw e;
}
}
});
setGlobalTrusted(newGlobal);
try {