From 5a3782a9fe031de70a20b70fa5656d507c8dfcae Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 14 Sep 2012 20:44:01 +0000 Subject: [PATCH] Add a few AP_DEBUG_ASSERT()s for the benefit of clang git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1384913 13f79535-47bb-0310-9956-ffa450edef68 --- modules/filters/mod_filter.c | 1 + server/log.c | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/filters/mod_filter.c b/modules/filters/mod_filter.c index 67cfd6bbc3..06e4d7a204 100644 --- a/modules/filters/mod_filter.c +++ b/modules/filters/mod_filter.c @@ -318,6 +318,7 @@ static apr_status_t filter_harness(ap_filter_t *f, apr_bucket_brigade *bb) ap_remove_output_filter(f); return ap_pass_brigade(f->next, bb); } + AP_DEBUG_ASSERT(ctx->func != NULL); } /* call the content filter with its own context, then restore our diff --git a/server/log.c b/server/log.c index 1c9a59bb1e..3372d7fc53 100644 --- a/server/log.c +++ b/server/log.c @@ -1015,6 +1015,7 @@ static int do_errorlog_format(apr_array_header_t *fmt, ap_errorlog_info *info, int skipping = 0; ap_errorlog_format_item *items = (ap_errorlog_format_item *)fmt->elts; + AP_DEBUG_ASSERT(fmt->nelts > 0); for (i = 0; i < fmt->nelts; ++i) { ap_errorlog_format_item *item = &items[i]; if (item->flags & AP_ERRORLOG_FLAG_FIELD_SEP) { @@ -1112,7 +1113,8 @@ static void log_error_core(const char *file, int line, int module_index, int done = 0; int line_number = 0; - if (r && r->connection) { + if (r) { + AP_DEBUG_ASSERT(r->connection != NULL); c = r->connection; } -- 2.49.0