diff options
| author |  Tyson Smith <tysmith@users.noreply.github.com> | 2019-09-09 22:35:40 -0700 |
|---|---|---|
| committer |  Abhishek Arya <inferno@chromium.org> | 2019-09-09 22:35:40 -0700 |
| commit | e400bcf8618beb7de424081ba51b257c5ab6c534 (patch) | |
| tree | f58d58ebbf3f37d925a86987653d0e37f6f37f8d | |
| parent | 0a3b5ee36a5c81908607c4e10a529e38ef1bc553 (diff) | |
[openh264] Enable i386 architecture fuzzing (#2820)
* [openh264] Add i386 architecture
* [openh264] Install libc++1:i386
* [openh264] Remove libc++1:i386 and libc++-dev:i386
| -rw-r--r-- | projects/openh264/Dockerfile | 4 | ||||
| -rwxr-xr-x | projects/openh264/build.sh | 5 | ||||
| -rw-r--r-- | projects/openh264/project.yaml | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/projects/openh264/Dockerfile b/projects/openh264/Dockerfile index ff598fca..bb347826 100644 --- a/projects/openh264/Dockerfile +++ b/projects/openh264/Dockerfile @@ -16,7 +16,9 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER twsmith@mozilla.com -RUN apt-get update && apt-get install -y libstdc++-5-dev nasm subversion +RUN dpkg --add-architecture i386 && \ + apt-get update && \ + apt-get install -y libstdc++-5-dev libstdc++-5-dev:i386 nasm subversion RUN git clone --depth 1 https://github.com/cisco/openh264.git openh264 WORKDIR openh264 COPY build.sh decoder_fuzzer.cpp $SRC/ diff --git a/projects/openh264/build.sh b/projects/openh264/build.sh index 8e4f100a..b0352aec 100755 --- a/projects/openh264/build.sh +++ b/projects/openh264/build.sh @@ -21,11 +21,10 @@ mv ./res/*.264 ./corpus/ zip -j0r ${OUT}/decoder_fuzzer_seed_corpus.zip ./corpus/ # build -if [[ $CXXFLAGS = *sanitize=memory* ]] -then +if [[ $CXXFLAGS = *sanitize=memory* ]]; then ASM_BUILD=No else ASM_BUILD=Yes fi -make -j$(nproc) USE_ASM=$ASM_BUILD BUILDTYPE=Debug libraries +make -j$(nproc) ARCH=$ARCHITECTURE USE_ASM=$ASM_BUILD BUILDTYPE=Debug libraries $CXX $CXXFLAGS -o $OUT/decoder_fuzzer -I./codec/api/svc -I./codec/console/common/inc -I./codec/common/inc -L. $LIB_FUZZING_ENGINE $SRC/decoder_fuzzer.cpp libopenh264.a diff --git a/projects/openh264/project.yaml b/projects/openh264/project.yaml index 72cc03d5..9c6b7a7f 100644 --- a/projects/openh264/project.yaml +++ b/projects/openh264/project.yaml @@ -11,3 +11,6 @@ sanitizers: - address - memory - undefined +architectures: + - i386 + - x86_64 |