archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-27 23:04:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8258956: Memory Leak in StringCoding on ThreadLocal resultCached StringCoding.Result

Browse source 
Reviewed-by: rriggs, alanb
This commit is contained in:
Naoto Sato 2021-01-14 16:58:37 +00:00
parent 8554fe6ebc
commit aba3431c4e
1 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/java.base/share/classes/java/lang/StringCoding.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2000, 2020, Oracle and/or its affiliates. All rights reserved. * Copyright (c) 2000, 2021, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -523,16 +523,25 @@ class StringCoding {
private static native void err(String msg); private static native void err(String msg);
/* The cached Result for each thread */ /* The cached Result for each thread */
private static final ThreadLocal<StringCoding.Result> private static final ThreadLocal<SoftReference<Result>>
resultCached = new ThreadLocal<>() { resultCached = new ThreadLocal<>() {
protected StringCoding.Result initialValue() { protected SoftReference<Result> initialValue() {
return new StringCoding.Result(); return new SoftReference<>(new Result());
}}; }};
private static Result resultCached() {
SoftReference<Result> sr = resultCached.get();
Result r;
if (sr == null || (r = sr.get()) == null) {
r = new Result();
resultCached.set(new SoftReference<>(r));
}
return r;
}
////////////////////////// ascii ////////////////////////////// ////////////////////////// ascii //////////////////////////////
private static Result decodeASCII(byte[] ba, int off, int len) { private static Result decodeASCII(byte[] ba, int off, int len) {
Result result = resultCached.get(); Result result = resultCached();
if (COMPACT_STRINGS && !hasNegatives(ba, off, len)) { if (COMPACT_STRINGS && !hasNegatives(ba, off, len)) {
return result.with(Arrays.copyOfRange(ba, off, off + len), return result.with(Arrays.copyOfRange(ba, off, off + len),
LATIN1); LATIN1);
@ -582,7 +591,7 @@ class StringCoding {
////////////////////////// latin1/8859_1 /////////////////////////// ////////////////////////// latin1/8859_1 ///////////////////////////
private static Result decodeLatin1(byte[] ba, int off, int len) { private static Result decodeLatin1(byte[] ba, int off, int len) {
Result result = resultCached.get(); Result result = resultCached();
if (COMPACT_STRINGS) { if (COMPACT_STRINGS) {
return result.with(Arrays.copyOfRange(ba, off, off + len), LATIN1); return result.with(Arrays.copyOfRange(ba, off, off + len), LATIN1);
} else { } else {
@ -720,13 +729,13 @@ class StringCoding {
private static Result decodeUTF8(byte[] src, int sp, int len, boolean doReplace) { private static Result decodeUTF8(byte[] src, int sp, int len, boolean doReplace) {
// ascii-bais, which has a relative impact to the non-ascii-only bytes // ascii-bais, which has a relative impact to the non-ascii-only bytes
if (COMPACT_STRINGS && !hasNegatives(src, sp, len)) if (COMPACT_STRINGS && !hasNegatives(src, sp, len))
return resultCached.get().with(Arrays.copyOfRange(src, sp, sp + len), return resultCached().with(Arrays.copyOfRange(src, sp, sp + len),
LATIN1); LATIN1);
return decodeUTF8_0(src, sp, len, doReplace); return decodeUTF8_0(src, sp, len, doReplace);
} }
private static Result decodeUTF8_0(byte[] src, int sp, int len, boolean doReplace) { private static Result decodeUTF8_0(byte[] src, int sp, int len, boolean doReplace) {
Result ret = resultCached.get(); Result ret = resultCached();
int sl = sp + len; int sl = sp + len;
int dp = 0; int dp = 0;
@ -1057,7 +1066,7 @@ class StringCoding {
} catch (CharacterCodingException x) { } catch (CharacterCodingException x) {
throw new IllegalArgumentException(x); // todo throw new IllegalArgumentException(x); // todo
} }
Result ret = resultCached.get().with(ca, 0, cb.position()); Result ret = resultCached().with(ca, 0, cb.position());
return new String(ret.value, ret.coder); return new String(ret.value, ret.coder);
} }