Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
J
jdk17u
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
einsteinathome
openjdk
jdk17u
Commits
b2c92fd6
Commit
b2c92fd6
authored
Aug 30, 2024
by
Todd V. Jonker
Committed by
Paul Hohensee
Aug 30, 2024
Browse files
Options
Downloads
Patches
Plain Diff
8319817: Charset constructor should make defensive copy of aliases
Backport-of: d6d7bdc7748c10963c3e58c0287b2472646bf36f
parent
42b5e12b
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/java.base/share/classes/java/nio/charset/Charset.java
+6
-2
6 additions, 2 deletions
src/java.base/share/classes/java/nio/charset/Charset.java
test/jdk/java/nio/charset/Charset/AliasesCopy.java
+69
-0
69 additions, 0 deletions
test/jdk/java/nio/charset/Charset/AliasesCopy.java
with
75 additions
and
2 deletions
src/java.base/share/classes/java/nio/charset/Charset.java
+
6
−
2
View file @
b2c92fd6
...
@@ -41,7 +41,6 @@ import java.util.Iterator;
...
@@ -41,7 +41,6 @@ import java.util.Iterator;
import
java.util.Locale
;
import
java.util.Locale
;
import
java.util.Map
;
import
java.util.Map
;
import
java.util.NoSuchElementException
;
import
java.util.NoSuchElementException
;
import
java.util.Objects
;
import
java.util.ServiceConfigurationError
;
import
java.util.ServiceConfigurationError
;
import
java.util.ServiceLoader
;
import
java.util.ServiceLoader
;
import
java.util.Set
;
import
java.util.Set
;
...
@@ -636,7 +635,12 @@ public abstract class Charset
...
@@ -636,7 +635,12 @@ public abstract class Charset
* If the canonical name or any of the aliases are illegal
* If the canonical name or any of the aliases are illegal
*/
*/
protected
Charset
(
String
canonicalName
,
String
[]
aliases
)
{
protected
Charset
(
String
canonicalName
,
String
[]
aliases
)
{
String
[]
as
=
Objects
.
requireNonNullElse
(
aliases
,
zeroAliases
);
String
[]
as
=
aliases
==
null
?
zeroAliases
:
VM
.
isSystemDomainLoader
(
getClass
().
getClassLoader
())
?
aliases
:
Arrays
.
copyOf
(
aliases
,
aliases
.
length
);
// Skip checks for the standard, built-in Charsets we always load
// Skip checks for the standard, built-in Charsets we always load
// during initialization.
// during initialization.
...
...
...
...
This diff is collapsed.
Click to expand it.
test/jdk/java/nio/charset/Charset/AliasesCopy.java
0 → 100644
+
69
−
0
View file @
b2c92fd6
/*
* Copyright (c) 2023, 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 8319817
* @summary Check that aliases cannot be mutated
* @run junit AliasesCopy
*/
import
java.nio.charset.Charset
;
import
java.nio.charset.CharsetDecoder
;
import
java.nio.charset.CharsetEncoder
;
import
java.util.Set
;
import
org.junit.jupiter.api.Test
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertIterableEquals
;
public
class
AliasesCopy
{
private
static
final
Set
<
String
>
ALIASES_SET
=
Set
.
of
(
"foo-alias"
);
private
static
final
String
[]
ALIASES_ARRAY
=
ALIASES_SET
.
toArray
(
String
[]::
new
);
@Test
public
void
aliasesCopy
()
{
final
FooCharset
cs
=
new
FooCharset
(
ALIASES_ARRAY
);
ALIASES_ARRAY
[
0
]
=
"bar-alias"
;
assertIterableEquals
(
ALIASES_SET
,
cs
.
aliases
());
}
private
static
final
class
FooCharset
extends
Charset
{
private
FooCharset
(
String
[]
aliases
)
{
super
(
"foo"
,
aliases
);
}
@Override
public
CharsetEncoder
newEncoder
()
{
throw
new
RuntimeException
(
"not implemented"
);
}
@Override
public
CharsetDecoder
newDecoder
()
{
throw
new
RuntimeException
(
"not implemented"
);
}
@Override
public
boolean
contains
(
Charset
cs
)
{
throw
new
RuntimeException
(
"not implemented"
);
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment