Skip to content

Check for null pointer dereference (almost) everywhere #3120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 20 commits into from
May 6, 2024
Merged

Check for null pointer dereference (almost) everywhere #3120

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e406bca
Fixed compilation issue (variable scope definition)
Feb 6, 2024
07f4076
Check for NULL pointers
Feb 7, 2024
91da587
Many null pointer checks
Feb 20, 2024
538ffa6
Added some null pointer checks.
Apr 4, 2024
518b8ba
more null pointer checks
Apr 4, 2024
649aea7
Merge branch 'v2/master' into v2/mst/nullcheck2
Apr 4, 2024
1014e47
Added missing prototype
Apr 5, 2024
c8e1904
Missing function
Apr 5, 2024
5f93853
fixed a NULL check
Apr 8, 2024
a01b9b5
minor fixes
Apr 10, 2024
bd43527
Added --enable-assertions configure flag
Apr 10, 2024
931c081
Enforcing -DNDEBUG (default normally)
Apr 11, 2024
38d4b5c
typo
Apr 12, 2024
556835c
Fixed corrupted character
Apr 12, 2024
5122f89
defined id_log() only once
Apr 16, 2024
62302c2
Update apache2/apache2_io.c
Apr 16, 2024
d35018e
another null check
Apr 16, 2024
243ac05
Merge branch 'v2/mst/nullcheck2' of https://github.com/marcstern/ModS…
Apr 16, 2024
4961f46
(re)fixed const type
Apr 16, 2024
dd400f7
Added --enable-assertions in CI
Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 17 additions & 3 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,20 @@ if test "$build_docs" -eq 1; then
AC_CONFIG_FILES([doc/Makefile])
fi


AC_ARG_ENABLE(assertions,
AS_HELP_STRING([--enable-assertions],
[Turn on assertions checks (undefine NDEBUG])),
[
if test "${enableval}" = "yes"; then
assertions=-UNDEBUG
MODSEC_EXTRA_CFLAGS="$MODSEC_EXTRA_CFLAGS $assertions"
else
assertions=
fi
]],
[
assertions=
])
# Add PCRE Studying

AC_ARG_ENABLE(pcre-study,
Expand Down Expand Up @@ -827,7 +840,8 @@ else
EXTRA_CFLAGS="-O2 -g -Wall $strict_compile"
fi
fi

EXTRA_CFLAGS="$EXTRA_CFLAGS $assertions"

MODSEC_EXTRA_CFLAGS="$pcre_study $pcre_match_limit $pcre_match_limit_recursion $pcre_jit $request_early $htaccess_config $lua_cache $debug_conf $debug_cache $debug_acmp $debug_mem $perf_meas $modsec_api $cpu_type $unique_id $log_filename $log_server $log_collection_delete_problem $log_dechunk $log_stopwatch $log_handler $log_server_context $collection_global_lock $large_stream_input"

APXS_WRAPPER=build/apxs-wrapper
Expand Down Expand Up @@ -905,7 +919,7 @@ AC_LINK_IFELSE(
CFLAGS="$ORIG_CFLAGS"
CPPFLAGS="$ORIG_CPPFLAGS"

# Current our unique download backend is curl, furhter we can support more.
# Currently our unique download backend is curl, further we can support more.
if test ! -z "${CURL_VERSION}"; then
AC_DEFINE([WITH_REMOTE_RULES], [1], [Enables SecRemoteRules support])
MODSEC_EXTRA_CFLAGS="$MODSEC_EXTRA_CFLAGS -DWITH_REMOTE_RULES"
Expand Down