fix(exec): avoid r2 inline eval collision

eleqtrizit · eleqtrizit · commit 3a087080b035 · 2026-06-24T18:12:36.000Z
diff --git a/src/infra/command-analysis/inline-eval.test.ts b/src/infra/command-analysis/inline-eval.test.ts
@@ -70,6 +70,7 @@ describe("exec inline eval detection", () => {
     expect(detectInterpreterInlineEvalArgv(["node", "script.js"])).toBeNull();
     expect(detectInterpreterInlineEvalArgv(["php", "-F", "filter.php"])).toBeNull();
     expect(detectInterpreterInlineEvalArgv(["Rscript", "script.R"])).toBeNull();
+    expect(detectInterpreterInlineEvalArgv(["r2", "-e", "bin.cache=true", "program"])).toBeNull();
     expect(detectInterpreterInlineEvalArgv(["awk", "-f", "script.awk", "data.csv"])).toBeNull();
     expect(detectInterpreterInlineEvalArgv(["find", ".", "-name", "*.ts"])).toBeNull();
     expect(detectInterpreterInlineEvalArgv(["xargs", "-0"])).toBeNull();
@@ -90,6 +91,7 @@ describe("exec inline eval detection", () => {
     expect(isInterpreterLikeAllowlistPattern("pypy3.10")).toBe(true);
     expect(isInterpreterLikeAllowlistPattern("**/node")).toBe(true);
     expect(isInterpreterLikeAllowlistPattern("Rscript")).toBe(true);
+    expect(isInterpreterLikeAllowlistPattern("r2")).toBe(false);
     expect(isInterpreterLikeAllowlistPattern("/usr/bin/awk")).toBe(true);
     expect(isInterpreterLikeAllowlistPattern("**/gawk")).toBe(true);
     expect(isInterpreterLikeAllowlistPattern("/usr/bin/mawk")).toBe(true);
diff --git a/src/infra/command-analysis/inline-eval.ts b/src/infra/command-analysis/inline-eval.ts
@@ -172,7 +172,9 @@ function stripInterpreterVersionSuffix(value: string): string {
 
 function interpreterNameVariants(value: string): readonly string[] {
   const stripped = stripInterpreterVersionSuffix(value);
-  return stripped === value ? [value] : [value, stripped];
+  // Do not synthesize one-letter interpreter names: commands like r2 can use
+  // their own eval flags and must not be mistaken for R inline execution.
+  return stripped === value || stripped.length < 2 ? [value] : [value, stripped];
 }
 
 function specNamesInclude(names: readonly string[], normalizedExecutable: string): boolean {

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,9 @@ function stripInterpreterVersionSuffix(value: string): string {`
`172`	`172`
`173`	`173`	`function interpreterNameVariants(value: string): readonly string[] {`
`174`	`174`	`const stripped = stripInterpreterVersionSuffix(value);`
`175`		`- return stripped === value ? [value] : [value, stripped];`
	`175`	`+ // Do not synthesize one-letter interpreter names: commands like r2 can use`
	`176`	`+ // their own eval flags and must not be mistaken for R inline execution.`
	`177`	`+ return stripped === value \|\| stripped.length < 2 ? [value] : [value, stripped];`
`176`	`178`	`}`
`177`	`179`
`178`	`180`	`function specNamesInclude(names: readonly string[], normalizedExecutable: string): boolean {`