From ef8f4fe12d03d6e015b6e5bfa0a9d063cff83b89 Mon Sep 17 00:00:00 2001 From: Vincent Bernat Date: Thu, 17 Nov 2016 15:42:40 +0100 Subject: [PATCH] BUG/MINOR: stick-table: handle out-of-memory condition gracefully In case `pool_alloc2()` returns NULL, propagate the condition to the caller. This could happen when limiting the amount of memory available for HAProxy with `-m`. [wt: backport to 1.6 and 1.5 needed] --- src/stick_table.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/stick_table.c b/src/stick_table.c index 7a2fcc21af..7026fe6565 100644 --- a/src/stick_table.c +++ b/src/stick_table.c @@ -170,9 +170,10 @@ struct stksess *stksess_new(struct stktable *t, struct stktable_key *key) return NULL; } - ts = pool_alloc2(t->pool) + t->data_size; + ts = pool_alloc2(t->pool); if (ts) { t->current++; + ts += t->data_size; stksess_init(t, ts); if (key) stksess_setkey(t, ts, key); -- 2.39.5