archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8333742: ProcessImpl and ProcessHandleImpl may mishandle processes that exit with code 259

Browse source 
Reviewed-by: rriggs
This commit is contained in:
Daniel Jeliński 2024-06-11 17:34:09 +00:00
parent aaaa86b571
commit b77bd5fd6a
4 changed files with 34 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/java.base/windows/classes/java/lang/ProcessImpl.java
View file

@ -557,8 +557,14 @@ final class ProcessImpl extends Process {
public int exitValue() {
int exitCode = getExitCodeProcess(handle);
if (exitCode == STILL_ACTIVE)
throw new IllegalThreadStateException("process has not exited");
if (exitCode == STILL_ACTIVE) {
// STILL_ACTIVE (259) might be the real exit code
if (isProcessAlive(handle)) {
throw new IllegalThreadStateException("process has not exited");
}
// call again, in case the process just exited
return getExitCodeProcess(handle);
}
return exitCode;
}
private static native int getExitCodeProcess(long handle);
@ -582,7 +588,7 @@ final class ProcessImpl extends Process {
throws InterruptedException
{
long remainingNanos = unit.toNanos(timeout); // throw NPE before other conditions
if (getExitCodeProcess(handle) != STILL_ACTIVE) return true;
if (!isProcessAlive(handle)) return true;
if (timeout <= 0) return false;
long deadline = System.nanoTime() + remainingNanos;
@ -601,13 +607,13 @@ final class ProcessImpl extends Process {
}
if (Thread.interrupted())
throw new InterruptedException();
if (getExitCodeProcess(handle) != STILL_ACTIVE) {
if (!isProcessAlive(handle)) {
return true;
}
remainingNanos = deadline - System.nanoTime();
} while (remainingNanos > 0);
return (getExitCodeProcess(handle) != STILL_ACTIVE);
return !isProcessAlive(handle);
}
private static native void waitForTimeoutInterruptibly(

30
src/java.base/windows/native/libjava/ProcessHandleImpl_win.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 2014, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2014, 2024, 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
@ -109,27 +109,19 @@ Java_java_lang_ProcessHandleImpl_waitForProcessExit0(JNIEnv* env,
if (handle == NULL) {
return exitValue; // No process with that pid is alive
}
do {
if (!GetExitCodeProcess(handle, &exitValue)) {
if (!GetExitCodeProcess(handle, &exitValue)) {
JNU_ThrowByNameWithLastError(env,
"java/lang/RuntimeException", "GetExitCodeProcess");
} else if (exitValue == STILL_ACTIVE) {
if (WaitForSingleObject(handle, INFINITE) /* Wait forever */
== WAIT_FAILED) {
JNU_ThrowByNameWithLastError(env,
"java/lang/RuntimeException", "WaitForSingleObjects");
} else if (!GetExitCodeProcess(handle, &exitValue)) {
JNU_ThrowByNameWithLastError(env,
"java/lang/RuntimeException", "GetExitCodeProcess");
break;
}
if (exitValue == STILL_ACTIVE) {
HANDLE events[2];
events[0] = handle;
events[1] = JVM_GetThreadInterruptEvent();
if (WaitForMultipleObjects(sizeof(events)/sizeof(events[0]), events,
FALSE, /* Wait for ANY event */
INFINITE) /* Wait forever */
== WAIT_FAILED) {
JNU_ThrowByNameWithLastError(env,
"java/lang/RuntimeException", "WaitForMultipleObjects");
break;
}
}
} while (exitValue == STILL_ACTIVE);
}
CloseHandle(handle); // Ignore return code
return exitValue;
}

7
src/java.base/windows/native/libjava/ProcessImpl_md.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1997, 2024, 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
@ -467,9 +467,8 @@ Java_java_lang_ProcessImpl_terminateProcess(JNIEnv *env, jclass ignored, jlong h
JNIEXPORT jboolean JNICALL
Java_java_lang_ProcessImpl_isProcessAlive(JNIEnv *env, jclass ignored, jlong handle)
{
DWORD dwExitStatus;
GetExitCodeProcess((HANDLE) handle, &dwExitStatus);
return dwExitStatus == STILL_ACTIVE;
return WaitForSingleObject((HANDLE) handle, 0) /* don't wait */
== WAIT_TIMEOUT;
}
JNIEXPORT jboolean JNICALL