Skip to content

Avoid /bin/sh -c #7787

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mernst wants to merge 6 commits into
base: master
Choose a base branch
from
+7 −19
Open

Avoid /bin/sh -c #7787

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1b34e73
Avoid `/bin/sh -c`
mernst Jul 2, 2026
7f7bee3
Reinstate `import`
mernst Jul 2, 2026
b00d861
Warn on dot failure
mernst Jul 2, 2026
32bbc6e
Avoid use of local variable
mernst Jul 2, 2026
96d3442
Merge branch 'master' into security-advisory-GHSA-g4jf-chwx-8gv4
mernst Jul 2, 2026
d2a17a7
No need to flush and sleep
mernst Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions dataflow/src/main/java/org/checkerframework/dataflow/cfg/visualize/CFGVisualizeLauncher.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,9 +327,12 @@ public static void writeStringOfCFG(
*/
private static void producePDF(String file) {
try {
String command = "dot -Tpdf \"" + file + "\" -o \"" + file + ".pdf\"";
Process child = Runtime.getRuntime().exec(new String[] {"/bin/sh", "-c", command});
child.waitFor();
ProcessBuilder pb = new ProcessBuilder("dot", "-Tpdf", file, "-o", file + ".pdf");
Process child = pb.start();
int exitCode = child.waitFor();
if (exitCode != 0) {
System.err.println("dot exited with status " + exitCode);
}
} catch (InterruptedException | IOException e) {
e.printStackTrace();
System.exit(1);
Expand Down
17 changes: 1 addition & 16 deletions framework/src/main/java/org/checkerframework/framework/stub/AnnotationFileElementTypes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
import java.lang.ProcessBuilder.Redirect;
import java.net.JarURLConnection;
import java.net.URI;
import java.net.URISyntaxException;
Expand Down Expand Up @@ -52,7 +51,6 @@
import org.checkerframework.javacutil.TypesUtils;
import org.plumelib.util.CollectionsPlume;
import org.plumelib.util.IPair;
import org.plumelib.util.SystemPlume;

/**
* Holds information about types parsed from annotation files (stub files or ajava files). When
Expand Down Expand Up @@ -929,20 +927,7 @@ private void prepJdkFromJar(@SuppressWarnings("UnusedVariable") URL jdkJarfile)
"End of remainingJdkStubFilesJar for %s from %s.%n", factoryClass, jarFileURL);

System.out.printf("Contents of %s:%n", jarFileURL);
assert jarFileURL.startsWith("file:");
ProcessBuilder pb =
new ProcessBuilder(
"/bin/sh", "-c", "jar tf '" + jarFileURL.substring(5) + "' | LC_ALL=C sort");
pb.redirectOutput(Redirect.INHERIT);
pb.redirectError(Redirect.INHERIT);
Process p = pb.start();
try {
p.waitFor();
} catch (InterruptedException e) {
// do nothing
}
System.out.flush();
SystemPlume.sleep(1);
printSortedIndented(entries.stream().map(JarEntry::getName).collect(Collectors.toList()));
System.out.printf("End of %s.%n", jarFileURL);
}
} catch (IOException e) {
Expand Down
Loading