mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: streams: Move the conn_stream allocation outside #IF USE_OPENSSL.

Browse Source 
When commit 477902bd2e8c1e978ad43d22dba1f28525bb797a made the conn_stream
allocation unconditional, it unfortunately moved the code doing the allocation
inside #if USE_OPENSSL, which means anybody compiling haproxy without
openssl wouldn't allocate any conn_stream, and would get a segfault later.
Fix that by moving the code that does the allocation outside #if USE_OPENSSL.
This commit is contained in:
Olivier Houchard 2020-01-24 14:10:55 +01:00 committed by Olivier Houchard
parent 99ac8a1aa4
commit ecffb7d841
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend.c
View File

@ -1386,13 +1386,13 @@ int connect_server(struct stream *s)
else else
return SF_ERR_INTERNAL; /* how did we get there ? */ return SF_ERR_INTERNAL; /* how did we get there ? */
#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
srv_cs = si_alloc_cs(&s->si[1], srv_conn); srv_cs = si_alloc_cs(&s->si[1], srv_conn);
if (!srv_cs) { if (!srv_cs) {
conn_free(srv_conn); conn_free(srv_conn);
return SF_ERR_RESOURCE; return SF_ERR_RESOURCE;
} }
srv_conn->ctx = srv_cs; srv_conn->ctx = srv_cs;
#if defined(USE_OPENSSL) && defined(TLSEXT_TYPE_application_layer_protocol_negotiation)
if (!srv || if (!srv ||
((!(srv->ssl_ctx.alpn_str) && !(srv->ssl_ctx.npn_str)) || ((!(srv->ssl_ctx.alpn_str) && !(srv->ssl_ctx.npn_str)) ||
srv->mux_proto || s->be->mode != PR_MODE_HTTP)) srv->mux_proto || s->be->mode != PR_MODE_HTTP))