From f2271926f19c8181b0c86713e1bfc54e27aa9a12 Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Fri, 23 Dec 2016 12:33:29 +0000 Subject: [PATCH] Merge r1775173 from trunk: Silence compiler warning: "686: warning: 'ok' may be used uninitialized in this function" This is a false positive, because the value of "ok" will only be used if stapling_get_cached_response() sets "rsp" to non-NULL in which case it will always have set "ok". Submitted by: rjung Reviewed/backported by: jim git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1775826 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 11 ----------- modules/ssl/ssl_util_stapling.c | 2 +- 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/STATUS b/STATUS index 84a5a9cf18..d17e99f4d6 100644 --- a/STATUS +++ b/STATUS @@ -119,17 +119,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - *) mod_ssl: Silence compiler warning - "686: warning: 'ok' may be used uninitialized in - this function" - This is a false positive, because the value of "ok" - will only be used if stapling_get_cached_response() - sets "rsp" to non-NULL in which case it will always - have set "ok". - trunk patch: http://svn.apache.org/r1775173 - 2.4.x patch: trunk works - +1: rjung, jim, ylavic - *) core: remove isascci check before narrower checks in vhost checking trunk patch: http://svn.apache.org/r1775199 http://svn.apache.org/r1775664 diff --git a/modules/ssl/ssl_util_stapling.c b/modules/ssl/ssl_util_stapling.c index 413e40f8b4..0737f43779 100644 --- a/modules/ssl/ssl_util_stapling.c +++ b/modules/ssl/ssl_util_stapling.c @@ -683,7 +683,7 @@ static int get_and_check_cached_response(server_rec *s, modssl_ctx_t *mctx, OCSP_RESPONSE **rsp, BOOL *pok, certinfo *cinf, apr_pool_t *p) { - BOOL ok; + BOOL ok = FALSE; int rv; AP_DEBUG_ASSERT(*rsp == NULL); -- 2.50.0