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

8314491: Linux: jexec launched via PATH fails to find java

Browse source 
Reviewed-by: dholmes, rriggs
This commit is contained in:
Vladimir Petko 2023-09-10 23:20:49 +00:00 • committed by David Holmes
parent 9a83d55887
commit dab1c213fd
2 changed files with 30 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/java.base/unix/native/launcher/jexec.c
View file

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2017, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 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
@ -168,7 +168,16 @@ int main(int argc, const char * argv[]) {
/* Get the path to the java binary, which is in a known position relative
* to our current position, which is in argv[0]. */
if (getJavaPath(argv[argi++], java, RELATIVE_DEPTH) != 0) {
int error = getJavaPath(argv[argi++], java, RELATIVE_DEPTH);
#ifdef __linux__
/* Try to read the symbolic link to the current binary
* if the java path can not be resolved from argv[0]. */
if (error != 0) {
error = getJavaPath("/proc/self/exe", java, RELATIVE_DEPTH);
}
#endif
if (error != 0) {
errorExit(errno, MISSING_JAVA_MSG);
}
alen = (argc + 2) * (sizeof (const char *));