infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-06-09 03:55:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

7152690: Initialization error with charset SJIS_0213 when security manager is enabled

Browse Source 
To use doPrivileged block to wrap the data reading code

Reviewed-by: alanb
This commit is contained in:
Xueming Shen 2012-04-12 10:55:51 -07:00
parent 17d3cafd5b
commit d4817a1e4f
2 changed files with 45 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jdk/src/share/classes/sun/nio/cs/ext/SJIS_0213.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2008, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2008, 2012, 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
@ -31,6 +31,8 @@ import java.nio.charset.Charset;
import java.nio.charset.CharsetEncoder;
import java.nio.charset.CharsetDecoder;
import java.nio.charset.CoderResult;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Arrays;
import sun.nio.cs.CharsetMapping;
@ -73,8 +75,12 @@ public class SJIS_0213 extends Charset {
return new Encoder(this);
}
static CharsetMapping mapping =
CharsetMapping.get(SJIS_0213.class.getResourceAsStream("sjis0213.dat"));
static CharsetMapping mapping = AccessController.doPrivileged(
new PrivilegedAction<CharsetMapping>() {
public CharsetMapping run() {
return CharsetMapping.get(SJIS_0213.class.getResourceAsStream("sjis0213.dat"));
}
});
protected static class Decoder extends CharsetDecoder {
protected static final char UNMAPPABLE = CharsetMapping.UNMAPPABLE_DECODING;

36
jdk/test/sun/nio/cs/TestSJIS0213_SM.java Normal file
View File

@ -0,0 +1,36 @@
/*
* Copyright (c) 2012, 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
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
/* @test
@bug 7152690
@summary Initialize SJIS_0213 charset with SecurityManager enabled
*/
public class TestSJIS0213_SM {
public static void main(String[] args) throws Throwable {
SecurityManager sm = System.getSecurityManager();
if (sm == null) {
System.setSecurityManager(new SecurityManager());
}
java.nio.charset.Charset.forName("SJIS_0213");
}
}