svn commit: r1384913 - in /httpd/httpd/trunk: modules/filters/mod_filter.c server/log.c

[sf...@apache.org]

Author: sf
Date: Fri Sep 14 20:44:01 2012
New Revision: 1384913

URL: http://svn.apache.org/viewvc?rev=1384913&view=rev
Log:
Add a few AP_DEBUG_ASSERT()s for the benefit of clang

Modified:
    httpd/httpd/trunk/modules/filters/mod_filter.c
    httpd/httpd/trunk/server/log.c

Modified: httpd/httpd/trunk/modules/filters/mod_filter.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_filter.c?rev=1384913&r1=1384912&r2=1384913&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/filters/mod_filter.c (original)
+++ httpd/httpd/trunk/modules/filters/mod_filter.c Fri Sep 14 20:44:01 2012
@@ -318,6 +318,7 @@ static apr_status_t filter_harness(ap_fi
             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

Modified: httpd/httpd/trunk/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=1384913&r1=1384912&r2=1384913&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Fri Sep 14 20:44:01 2012
@@ -1015,6 +1015,7 @@ static int do_errorlog_format(apr_array_
     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 *f
     int done = 0;
     int line_number = 0;
 
-    if (r && r->connection) {
+    if (r) {
+        AP_DEBUG_ASSERT(r->connection != NULL);
         c = r->connection;
     }