From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 15 May 2023 07:53:29 +0000 (+0200)
Subject: MINOR: stconn: Remove useless test on sedesc on detach to release the xref
X-Git-Tag: v2.8-dev12~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6eb53b138d9f190b0fa3ae4abfc292a9c7ca7cdd;p=thirdparty%2Fhaproxy.git

MINOR: stconn: Remove useless test on sedesc on detach to release the xref

When the SC is detached from the endpoint, the xref between the endpoints is
removed. At this stage, the sedesc cannot be undefined. So we can remove the
test on it.

This issue should fix the issue #2156. No backport needed.
---

diff --git a/src/stconn.c b/src/stconn.c
index 2339566d7d..3d80b2c190 100644
--- a/src/stconn.c
+++ b/src/stconn.c
@@ -351,18 +351,16 @@ int sc_attach_strm(struct stconn *sc, struct stream *strm)
 static void sc_detach_endp(struct stconn **scp)
 {
 	struct stconn *sc = *scp;
+	struct xref *peer;
 
 	if (!sc)
 		return;
 
-	if (sc->sedesc) {
-		struct xref *peer;
 
-		/* Remove my link in the original objects. */
-		peer = xref_get_peer_and_lock(&sc->sedesc->xref);
-		if (peer)
-			xref_disconnect(&sc->sedesc->xref, peer);
-	}
+	/* Remove my link in the original objects. */
+	peer = xref_get_peer_and_lock(&sc->sedesc->xref);
+	if (peer)
+		xref_disconnect(&sc->sedesc->xref, peer);
 
 	if (sc_ep_test(sc, SE_FL_T_MUX)) {
 		struct connection *conn = __sc_conn(sc);