stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8332084: Ensure JdkConsoleImpl.restoreEcho visibility in a shutdown hook

Browse Source 
Reviewed-by: prappo, joehw, smarks
This commit is contained in:
Naoto Sato 2024-05-24 17:51:49 +00:00
parent b3b33667ad
commit 236432dbdb
1 changed files with 18 additions and 8 deletions

26
src/java.base/share/classes/jdk/internal/io/JdkConsoleImpl.java

@ -127,7 +127,9 @@ public final class JdkConsoleImpl implements JdkConsole {
synchronized(readLock) {
installShutdownHook();
try {
restoreEcho = echo(false);
synchronized(restoreEchoLock) {
restoreEcho = echo(false);
}
} catch (IOException x) {
throw new IOError(x);
}
@ -140,8 +142,11 @@ public final class JdkConsoleImpl implements JdkConsole {
ioe = new IOError(x);
} finally {
try {
if (restoreEcho)
restoreEcho = echo(true);
synchronized(restoreEchoLock) {
if (restoreEcho) {
restoreEcho = echo(true);
}
}
} catch (IOException x) {
if (ioe == null)
ioe = new IOError(x);
@ -154,7 +159,7 @@ public final class JdkConsoleImpl implements JdkConsole {
if (reader instanceof LineReader lr) {
lr.zeroOut();
}
} catch (IOException x) {
} catch (IOException _) {
// ignore
}
throw ioe;
@ -178,13 +183,15 @@ public final class JdkConsoleImpl implements JdkConsole {
new Runnable() {
public void run() {
try {
if (restoreEcho) {
echo(true);
synchronized(restoreEchoLock) {
if (restoreEcho) {
echo(true);
}
}
} catch (IOException x) { }
} catch (IOException _) { }
}
});
} catch (IllegalStateException e) {
} catch (IllegalStateException _) {
// shutdown is already in progress and readPassword is first used
// by a shutdown hook
}
@ -209,6 +216,8 @@ public final class JdkConsoleImpl implements JdkConsole {
private final Charset charset;
private final Object readLock;
private final Object writeLock;
// Must not block while holding this. It is used in the shutdown hook.
private final Object restoreEchoLock;
private final Reader reader;
private final Writer out;
private final PrintWriter pw;
@ -379,6 +388,7 @@ public final class JdkConsoleImpl implements JdkConsole {
this.charset = charset;
readLock = new Object();
writeLock = new Object();
restoreEchoLock = new Object();
out = StreamEncoder.forOutputStreamWriter(
new FileOutputStream(FileDescriptor.out),
writeLock,