File util-linux-libsmartcols-fix-reduction-stages-us... of Package util-linux

Overview Repositories Revisions Requests Users Attributes Meta

File util-linux-libsmartcols-fix-reduction-stages-use.patch of Package util-linux

From a74b911bd9f20670ead92973bcacab4ef8fa3b79 Mon Sep 17 00:00:00 2001
From: Karel Zak <kzak@redhat.com>
Date: Wed, 15 May 2024 15:45:19 +0200
Subject: [PATCH] libsmartcols: fix reduction stages use

There is no proper check for the number of reduction stages, so in
some cases, the code can loop indefinitely.

The patch also fixes 'rc' variable shadowing.

Fixes: https://github.com/util-linux/util-linux/issues/3046
Signed-off-by: Karel Zak <kzak@redhat.com>
(cherry picked from commit 8a01276a3c5bc09dce342e087019c704d8c56a32)
---
 libsmartcols/src/calculate.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/libsmartcols/src/calculate.c b/libsmartcols/src/calculate.c
index ad0b15d92..1426d235a 100644
--- a/libsmartcols/src/calculate.c
+++ b/libsmartcols/src/calculate.c
@@ -302,6 +302,8 @@ static int reduce_column(struct libscols_table *tb,
 	size_t wanted, org_width, reduce = 1;
 	int is_trunc = 0;
 
+	if (stage > 6)
+		return -1;
 	if (tb->termwidth >= *width)
 		return 1;
 	/* ignore hidden columns */
@@ -481,7 +483,7 @@ int __scols_calculate(struct libscols_table *tb, struct ul_buffer *buf)
 	/* reduce columns width */
 	while (width > tb->termwidth) {
 		size_t org_width = width;
-		int rc = 0, n = 0;
+		int xrc = 0, n = 0;
 
 		if (!sorted) {
 			DBG(TAB, ul_debugobj(tb, "sorting by deviation"));
@@ -496,12 +498,12 @@ int __scols_calculate(struct libscols_table *tb, struct ul_buffer *buf)
 		scols_reset_iter(&itr, SCOLS_ITER_BACKWARD);
 
 		while (width > tb->termwidth
-		       && rc == 0
+		       && xrc == 0
 		       && scols_table_next_column(tb, &itr, &cl) == 0) {
-			rc = reduce_column(tb, cl, &width, stage, n++);
+			xrc = reduce_column(tb, cl, &width, stage, n++);
 		}
 
-		if (rc != 0)
+		if (xrc != 0)
 			break;
 		if (org_width == width)
 			stage++;
-- 
2.45.0

Places

File util-linux-libsmartcols-fix-reduction-stages-use.patch of Package util-linux

Places