From: Christopher Faulet <cfaulet@haproxy.com>
Date: Tue, 23 Nov 2021 15:03:05 +0000 (+0100)
Subject: BUG/MINOR: cache: Fix loop on cache entries in "show cache"
X-Git-Tag: v2.6-dev1~379
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=27f88a9059d0e343d82a0319b622e0f4248b0bb8;p=thirdparty%2Fhaproxy.git

BUG/MINOR: cache: Fix loop on cache entries in "show cache"

A regression was introduced in the commit da91842b6 ("BUG/MEDIUM: cache/cli:
make "show cache" thread-safe"). When cli_io_handler_show_cache() is called,
only one node is retrieved and is used to fill the output buffer in loop.
Once set, the "node" variable is never renewed. At the end, all nodes are
dumped but each one is duplicated several time into the output buffer.

This patch must be backported everywhere the above commit is. It means only
to 2.5 and 2.4.
---

diff --git a/src/cache.c b/src/cache.c
index 6ac23b27ce..04e7327663 100644
--- a/src/cache.c
+++ b/src/cache.c
@@ -2589,8 +2589,7 @@ static int cli_io_handler_show_cache(struct appctx *appctx)
 		while (1) {
 
 			shctx_lock(shctx_ptr(cache));
-			if (!node)
-				node = eb32_lookup_ge(&cache->entries, next_key);
+			node = eb32_lookup_ge(&cache->entries, next_key);
 			if (!node) {
 				shctx_unlock(shctx_ptr(cache));
 				appctx->ctx.cli.i0 = 0;