mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-23 06:41:32 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: ssl: refine the error testing for fc_err and fc_err_str

Browse Source 
In issue #1645, coverity suspects some dead code due to a pair of
remaining tests on "if (!ctx)". While all other functions test the
context earlier, these ones used to only test the connection and the
transport. It's still not very clear to me if there are certain error
cases that can lead to no SSL being initially set while the rest is
ready, and the SSL arriving later, but better preserve this original
construct by testing first the connection and only later the context.
This commit is contained in:
Willy Tarreau 2022-04-12 07:40:42 +02:00
parent 3a0a0d6cc1
commit ce7a5e0967
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/ssl_sample.c
View File

@ -1655,8 +1655,7 @@ smp_fetch_ssl_fc_err(const struct arg *args, struct sample *smp, const char *kw,
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(smp->strm->csb) : NULL; smp->strm ? cs_conn(smp->strm->csb) : NULL;
ctx = conn_get_ssl_sock_ctx(conn); if (!conn)
if (!ctx)
return 0; return 0;
if (conn->flags & CO_FL_WAIT_XPRT && !conn->err_code) { if (conn->flags & CO_FL_WAIT_XPRT && !conn->err_code) {
@ -1664,6 +1663,7 @@ smp_fetch_ssl_fc_err(const struct arg *args, struct sample *smp, const char *kw,
return 0; return 0;
} }
ctx = conn_get_ssl_sock_ctx(conn);
if (!ctx) if (!ctx)
return 0; return 0;
@ -1708,8 +1708,7 @@ smp_fetch_ssl_fc_err_str(const struct arg *args, struct sample *smp, const char
conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) : conn = (kw[4] != 'b') ? objt_conn(smp->sess->origin) :
smp->strm ? cs_conn(smp->strm->csb) : NULL; smp->strm ? cs_conn(smp->strm->csb) : NULL;
ctx = conn_get_ssl_sock_ctx(conn); if (!conn)
if (!ctx)
return 0; return 0;
if (conn->flags & CO_FL_WAIT_XPRT && !conn->err_code) { if (conn->flags & CO_FL_WAIT_XPRT && !conn->err_code) {
@ -1717,6 +1716,7 @@ smp_fetch_ssl_fc_err_str(const struct arg *args, struct sample *smp, const char
return 0; return 0;
} }
ctx = conn_get_ssl_sock_ctx(conn);
if (!ctx || !ctx->error_code) if (!ctx || !ctx->error_code)
return 0; return 0;