Rooba
/
oss-fuzz
mirror of https://github.com/google/oss-fuzz.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[spring-integration -shell] Fix issues 52119 52225 (#8729) 

Fix two build issues for spring-integration and spring-shell

- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52119
- https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=52225
This commit is contained in:
Jacek Trossen 2022-10-10 15:22:19 +02:00 committed by GitHub
parent b5d5d34d89
commit 17b3e7e2d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
projects/spring-integration/Dockerfile
View File

@ -16,15 +16,8 @@
FROM gcr.io/oss-fuzz-base/base-builder-jvm
ARG java_home="/out/open-jdk-17"
RUN mkdir -p $java_home
RUN apt update && apt install -y openjdk-17-jdk
ENV JAVA_HOME $java_home
ENV PATH "${java_home}:${PATH}"
ENV JVM_LD_LIBRARY_PATH "$java_home/lib/server"
RUN apt-get update && apt-get install -y make autoconf automake libtool
RUN git clone --depth 1 https://github.com/spring-projects/spring-integration spring-integration # or use other version control
RUN git clone --depth 1 https://github.com/google/fuzzing && \

4
projects/spring-integration/build.sh
View File

@ -15,8 +15,10 @@
#
################################################################################
export JAVA_HOME="$OUT/open-jdk-17"
mkdir -p $JAVA_HOME
cp -rL "/usr/lib/jvm/java-17-openjdk-amd64/." "$JAVA_HOME" || true
rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME"
JVM_LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
git apply $SRC/*.patch

6
projects/spring-shell/Dockerfile
View File

@ -16,13 +16,7 @@
FROM gcr.io/oss-fuzz-base/base-builder-jvm
ARG java_home="/out/open-jdk-17"
RUN mkdir -p $java_home
RUN apt update && apt install -y openjdk-17-jdk
ENV JAVA_HOME $java_home
ENV PATH "${java_home}:${PATH}"
ENV JVM_LD_LIBRARY_PATH "$java_home/lib/server"
RUN git clone --depth 1 https://github.com/spring-projects/spring-shell.git spring-shell # or use other version control
COPY add-shadow-*.patch $SRC/

5
projects/spring-shell/build.sh
View File

@ -15,8 +15,10 @@
#
################################################################################
export JAVA_HOME="$OUT/open-jdk-17"
mkdir -p $JAVA_HOME
cp -rL "/usr/lib/jvm/java-17-openjdk-amd64/." "$JAVA_HOME" || true
rsync -aL --exclude=*.zip "/usr/lib/jvm/java-17-openjdk-amd64/" "$JAVA_HOME"
JVM_LD_LIBRARY_PATH="${JAVA_HOME}/lib/server"
CURRENT_VERSION=$(./gradlew properties --no-daemon --console=plain | sed -nr "s/^version:\ (.*)/\1/p")
@ -56,7 +58,6 @@ function create_fuzz_targets() {
\$this_dir/jazzer_driver --agent_path=\$this_dir/jazzer_agent_deploy.jar \
--cp=$RUNTIME_CLASSPATH \
--target_class=$fuzzer_basename \
--instrumentation_excludes=org.aspectj.weaver.** \
--jvm_args=\"-Xmx2048m\" \
\$@" > $OUT/$fuzzer_basename
chmod u+x $OUT/$fuzzer_basename