OpenJDK / jdk-updates / jdk12u
changeset 53434:289e5c1fced1
8216381: More limited privilege usage
Reviewed-by: ahgross, coffeys, rhalade
| author | mullan |
|---|---|
| date | Thu, 07 Feb 2019 08:47:10 -0500 |
| parents | 4a708c0cc1b7 |
| children | b5e12076c1f7 |
| files | src/java.base/share/classes/java/security/AccessController.java |
| diffstat | 1 files changed, 5 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/java.base/share/classes/java/security/AccessController.java Wed Jan 23 14:45:54 2019 -0800 +++ b/src/java.base/share/classes/java/security/AccessController.java Thu Feb 07 08:47:10 2019 -0500 @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * * This code is free software; you can redistribute it and/or modify it @@ -443,7 +443,8 @@ throw new NullPointerException("null permissions parameter"); } Class<?> caller = Reflection.getCallerClass(); - return AccessController.doPrivileged(action, createWrapper(null, + DomainCombiner dc = (context == null) ? null : context.getCombiner(); + return AccessController.doPrivileged(action, createWrapper(dc, caller, parent, context, perms)); } @@ -868,7 +869,8 @@ throw new NullPointerException("null permissions parameter"); } Class<?> caller = Reflection.getCallerClass(); - return AccessController.doPrivileged(action, createWrapper(null, caller, parent, context, perms)); + DomainCombiner dc = (context == null) ? null : context.getCombiner(); + return AccessController.doPrivileged(action, createWrapper(dc, caller, parent, context, perms)); }