41 lines
1.2 KiB
Diff
41 lines
1.2 KiB
Diff
From b3dc43ddadfd98b745823deaed6e7743b59442eb Mon Sep 17 00:00:00 2001
|
|
From: Christopher Faulet <cfaulet@haproxy.com>
|
|
Date: Tue, 27 Sep 2022 09:14:47 +0200
|
|
Subject: [PATCH] BUG/MINOR: stream: Perform errors handling in right order in
|
|
stream_new()
|
|
|
|
The frontend SC is attached before the backend one is allocated. Thus an
|
|
allocation error on backend SC must be handled before an error on the
|
|
frontend SC.
|
|
|
|
This patch must be backported to 2.6.
|
|
|
|
(cherry picked from commit 4cfc038cb19996f5d2fe60284fdb556503a5f9ef)
|
|
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
|
|
|
|
Conflict: NA
|
|
Reference: https://git.haproxy.org/?p=haproxy-2.6.git;a=commit;h=b3dc43ddadfd98b745823deaed6e7743b59442eb
|
|
---
|
|
src/stream.c | 4 ++--
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
|
diff --git a/src/stream.c b/src/stream.c
|
|
index 0cbbb70b7..fc8b82af0 100644
|
|
--- a/src/stream.c
|
|
+++ b/src/stream.c
|
|
@@ -566,9 +566,9 @@ struct stream *stream_new(struct session *sess, struct stconn *sc, struct buffer
|
|
out_fail_accept:
|
|
flt_stream_release(s, 0);
|
|
LIST_DELETE(&s->list);
|
|
- out_fail_attach_scf:
|
|
- sc_free(s->scb);
|
|
out_fail_alloc_scb:
|
|
+ sc_free(s->scb);
|
|
+ out_fail_attach_scf:
|
|
task_destroy(t);
|
|
out_fail_alloc:
|
|
pool_free(pool_head_stream, s);
|
|
--
|
|
2.33.0
|
|
|