RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-03-10 05:21:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

BUG/MEDIUM: mux_pt: Don't call unsubscribe if we did not subscribe.

Browse Source 
In mux_pt_attach(), don't inconditionally call unsubscribe, and only do so
if we were subscribed. The idea was that at this point we would always be
subscribed, as for the mux_pt attach would only be called after at least one
request, after which the mux_pt would have subscribed, but this is wrong.
We can also be called if for some reason the connection failed before the
xprt was created. And with no xprt, attempting to call unsubscribe will
probably lead to a crash.

This should be backported to 2.0.
This commit is contained in:
Olivier Houchard 2019-08-10 23:56:16 +02:00 committed by Willy Tarreau
parent f5cab82025
commit ea32b0fa50
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mux_pt.c
View File

@ -146,7 +146,8 @@ static struct conn_stream *mux_pt_attach(struct connection *conn, struct session
struct conn_stream *cs;
struct mux_pt_ctx *ctx = conn->ctx;
conn->xprt->unsubscribe(ctx->conn, conn->xprt_ctx, SUB_RETRY_RECV, &ctx->wait_event);
if (ctx->wait_event.events)
conn->xprt->unsubscribe(ctx->conn, conn->xprt_ctx, SUB_RETRY_RECV, &ctx->wait_event);
cs = cs_new(conn);
if (!cs)
goto fail;