From 5c005263d58132584afb67a0392ad7424f42c942 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Sat, 8 Oct 2011 07:41:50 +0000 Subject: [PATCH] Fix a potential NULL pointer dereference found by clang. Add a AP_DEBUG_ASSERT to quiet a clang false positive. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180329 13f79535-47bb-0310-9956-ffa450edef68 --- modules/cache/mod_socache_shmcb.c | 1 + modules/ssl/ssl_engine_init.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/modules/cache/mod_socache_shmcb.c b/modules/cache/mod_socache_shmcb.c index c44c064ec4..710dd52bf2 100644 --- a/modules/cache/mod_socache_shmcb.c +++ b/modules/cache/mod_socache_shmcb.c @@ -566,6 +566,7 @@ static void socache_shmcb_status(ap_socache_instance_t *ctx, double expiry_total = 0; int index_pct, cache_pct; + AP_DEBUG_ASSERT(header->subcache_num > 0); ap_log_rerror(APLOG_MARK, APLOG_DEBUG, 0, r, "inside shmcb_status"); /* Perform the iteration inside the mutex to avoid corruption or invalid * pointer arithmetic. The rest of our logic uses read-only header data so diff --git a/modules/ssl/ssl_engine_init.c b/modules/ssl/ssl_engine_init.c index 114e89269f..c9912a8671 100644 --- a/modules/ssl/ssl_engine_init.c +++ b/modules/ssl/ssl_engine_init.c @@ -257,7 +257,7 @@ int ssl_init_Module(apr_pool_t *p, apr_pool_t *plog, sc->session_cache_timeout = SSL_SESSION_CACHE_TIMEOUT; } - if (sc->server->pphrase_dialog_type == SSL_PPTYPE_UNSET) { + if (sc->server && sc->server->pphrase_dialog_type == SSL_PPTYPE_UNSET) { sc->server->pphrase_dialog_type = SSL_PPTYPE_BUILTIN; } -- 2.40.0