From 1fc6a72e9d80436c51a762232e36b820aa3ced2a Mon Sep 17 00:00:00 2001 From: Sean Mullan Date: Mon, 22 Apr 2013 08:33:12 -0400 Subject: [PATCH] 8011896: Add check for invalid offset for new AccessControlContext isAuthorized field Reviewed-by: acorn --- hotspot/src/share/vm/classfile/javaClasses.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hotspot/src/share/vm/classfile/javaClasses.cpp b/hotspot/src/share/vm/classfile/javaClasses.cpp index 0550adc9ebc..9c09d711b95 100644 --- a/hotspot/src/share/vm/classfile/javaClasses.cpp +++ b/hotspot/src/share/vm/classfile/javaClasses.cpp @@ -2819,8 +2819,10 @@ oop java_security_AccessControlContext::create(objArrayHandle context, bool isPr result->obj_field_put(_context_offset, context()); result->obj_field_put(_privilegedContext_offset, privileged_context()); result->bool_field_put(_isPrivileged_offset, isPrivileged); - // whitelist AccessControlContexts created by the JVM. - result->bool_field_put(_isAuthorized_offset, true); + // whitelist AccessControlContexts created by the JVM if present + if (_isAuthorized_offset != -1) { + result->bool_field_put(_isAuthorized_offset, true); + } return result; }