From: Christopher Faulet <cfaulet@haproxy.com>
Date: Fri, 11 Jun 2021 13:55:56 +0000 (+0200)
Subject: CLEANUP: l7-retries: do not test the buffer before calling b_alloc()
X-Git-Tag: v2.5-dev1~153
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0fe1864f7db556f99f3a715a8a383902ed36bfae;p=thirdparty%2Fhaproxy.git

CLEANUP: l7-retries: do not test the buffer before calling b_alloc()

The return value is enough now to know if the allocation succeeded or
failed.

This cleanup was already pushed by Willy (f499f50) but a revert crushed
it. It may be backported to the 2.4 because the original patch was done on
this version.
---

diff --git a/src/stream_interface.c b/src/stream_interface.c
index cd01840e25..44001230cf 100644
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -740,9 +740,7 @@ int si_cs_send(struct conn_stream *cs)
 			if (!s->txn || (s->txn->req.msg_state != HTTP_MSG_DONE))
 				si->flags &= ~SI_FL_L7_RETRY;
 			else {
-				if (b_is_null(&si->l7_buffer))
-					b_alloc(&si->l7_buffer);
-				if (b_is_null(&si->l7_buffer))
+				if (b_alloc(&si->l7_buffer) == NULL)
 					si->flags &= ~SI_FL_L7_RETRY;
 				else {
 					memcpy(b_orig(&si->l7_buffer),