Skip to content

Commit

Permalink
- Attempt to fix build failure in oss-fuzz
Browse files Browse the repository at this point in the history
because of reallocarray.
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14648.
Does not omit compile flags from commandline.
  • Loading branch information
wcawijngaards committed May 8, 2019
1 parent 779b86f commit a8d0177
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 1 deletion.
10 changes: 10 additions & 0 deletions configure
Original file line number Diff line number Diff line change
Expand Up @@ -21089,6 +21089,15 @@ fi



if echo "$CFLAGS" | grep 'FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION' >/dev/null; then
:
# do not strip flags, so they are on the command line for fuzzer builds.
# because otherwise reallocarray looks like it can link in the
# configure test, but doesn't really link at link time.
# this is, by the way, safe for production, and keeps the
# commandline more explicitly with the compile defines for
# special compile settings.
else

{ $as_echo "$as_me:${as_lineno-$LINENO}: Stripping extension flags..." >&5
$as_echo "$as_me: Stripping extension flags..." >&6;}
Expand Down Expand Up @@ -21165,6 +21174,7 @@ $as_echo "#define OMITTED__D_LARGEFILE_SOURCE_1 1" >>confdefs.h
fi


fi
if test -n "$LATE_LDFLAGS"; then
LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
fi
Expand Down
12 changes: 11 additions & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -1644,7 +1644,17 @@ fi
AC_SUBST(ALLTARGET)
AC_SUBST(INSTALLTARGET)

ACX_STRIP_EXT_FLAGS
if echo "$CFLAGS" | grep 'FUZZING_BUILD_MODE_UNSAFE_FOR_PRODUCTION' >/dev/null; then
:
# do not strip flags, so they are on the command line for fuzzer builds.
# because otherwise reallocarray looks like it can link in the
# configure test, but doesn't really link at link time.
# this is, by the way, safe for production, and keeps the
# commandline more explicitly with the compile defines for
# special compile settings.
else
ACX_STRIP_EXT_FLAGS
fi
if test -n "$LATE_LDFLAGS"; then
LDFLAGS="$LATE_LDFLAGS $LDFLAGS"
fi
Expand Down
5 changes: 5 additions & 0 deletions doc/Changelog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
8 May 2019: Wouter
- Attempt to fix build failure in oss-fuzz because of reallocarray.
https://bugs.chromium.org/p/oss-fuzz/issues/detail?id=14648.
Does not omit compile flags from commandline.

7 May 2019: Wouter
- Fix edns-subnet locks, in error cases the lock was not unlocked.
- Fix doxygen output error on readme markdown vignettes.
Expand Down

0 comments on commit a8d0177

Please sign in to comment.