From 6562f44c8a31d20b423fe7f42283b330934c7b70 Mon Sep 17 00:00:00 2001
From: Fabian Meumertzheim <meumertzheim@code-intelligence.com>
Date: Wed, 20 Oct 2021 19:24:25 +0200
Subject: [PATCH] Fix builds after Jazzer breaking change (#6622)

Follow-up to f043a72a0e632455f9939383efd60c131973c570, which became necessary due to
https://github.com/CodeIntelligenceTesting/jazzer/commit/24069c388579f54ec9872e61efa44f5e6065f838
---
 docs/getting-started/new-project-guide/jvm_lang.md | 2 +-
 infra/base-images/base-runner/coverage             | 2 +-
 projects/apache-commons/build.sh                   | 2 +-
 projects/zxing/build.sh                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/getting-started/new-project-guide/jvm_lang.md b/docs/getting-started/new-project-guide/jvm_lang.md
index 5d25d3cbd..14285f4c1 100644
--- a/docs/getting-started/new-project-guide/jvm_lang.md
+++ b/docs/getting-started/new-project-guide/jvm_lang.md
@@ -138,7 +138,7 @@ LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \
 \$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
 --cp=$RUNTIME_CLASSPATH \
 --target_class=$fuzzer_basename \
---jvm_args=\"-Xmx2048m;-Djava.awt.headless=true\" \
+--jvm_args=\"-Xmx2048m:-Djava.awt.headless=true\" \
 \$@" > $OUT/$fuzzer_basename
   chmod +x $OUT/$fuzzer_basename
 done
diff --git a/infra/base-images/base-runner/coverage b/infra/base-images/base-runner/coverage
index 3c7b274e4..8312f38ce 100755
--- a/infra/base-images/base-runner/coverage
+++ b/infra/base-images/base-runner/coverage
@@ -152,7 +152,7 @@ function run_java_fuzz_target {
   # Use 100s timeout instead of 25s as code coverage builds can be very slow.
   local jacoco_args="destfile=$exec_file,classdumpdir=$class_dump_dir,excludes=com.code_intelligence.jazzer.*"
   local args="-merge=1 -timeout=100 --nohooks \
-      --additional_jvm_args=-javaagent:/opt/jacoco-agent.jar=$jacoco_args \
+      --additional_jvm_args=-javaagent\\:/opt/jacoco-agent.jar=$jacoco_args \
       $corpus_dummy $corpus_real"
 
   timeout $TIMEOUT $OUT/$target $args &> $LOGS_DIR/$target.log
diff --git a/projects/apache-commons/build.sh b/projects/apache-commons/build.sh
index 6716afdfa..083fca542 100755
--- a/projects/apache-commons/build.sh
+++ b/projects/apache-commons/build.sh
@@ -59,7 +59,7 @@ LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \
 \$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
 --cp=$RUNTIME_CLASSPATH \
 --target_class=$fuzzer_basename \
---jvm_args=\"-Xmx2048m;-Djava.awt.headless=true\" \
+--jvm_args=\"-Xmx2048m:-Djava.awt.headless=true\" \
 \$@" > $OUT/$fuzzer_basename
     chmod +x $OUT/$fuzzer_basename
   done
diff --git a/projects/zxing/build.sh b/projects/zxing/build.sh
index 70f15c0a6..6fb5e590d 100644
--- a/projects/zxing/build.sh
+++ b/projects/zxing/build.sh
@@ -47,7 +47,7 @@ LD_LIBRARY_PATH=\"$JVM_LD_LIBRARY_PATH\":\$this_dir \
 \$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
 --cp=$RUNTIME_CLASSPATH \
 --target_class=$fuzzer_basename \
---jvm_args=\"-Xmx2048m;-Djava.awt.headless=true\" \
+--jvm_args=\"-Xmx2048m:-Djava.awt.headless=true\" \
 \$@" > $OUT/$fuzzer_basename
   chmod u+x $OUT/$fuzzer_basename
 done