From: Karel Zak <kzak@redhat.com>
Date: Thu, 20 Mar 2025 13:28:17 +0000 (+0100)
Subject: irqtop: use output string in a more robust way
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c52a3645aa2ae5a0b8f374e66747dc6a430ba44c;p=thirdparty%2Futil-linux.git

irqtop: use output string in a more robust way

Reporte-by: Benno Schulenberg <bensberg@telfort.nl>
Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/sys-utils/irqtop.c b/sys-utils/irqtop.c
index c7222f1d3..9c9b0ba05 100644
--- a/sys-utils/irqtop.c
+++ b/sys-utils/irqtop.c
@@ -129,7 +129,7 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
 	struct libscols_table *table, *cpus = NULL;
 	struct irq_stat *stat;
 	time_t now = time(NULL);
-	char timestr[64], *data, *data0, *p;
+	char timestr[64], *data, *data0, *p = NULL;
 	char *input_file;
 
 	/* make irqs table */
@@ -171,7 +171,8 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
 	/* print cpus table or not by -c option */
 	if (cpus) {
 		scols_print_table_to_string(cpus, &data);
-		irqtop_printf(ctl, "%s\n\n", data);
+		if (data && *data)
+			irqtop_printf(ctl, "%s\n\n", data);
 		free(data);
 	}
 
@@ -179,7 +180,8 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
 	scols_print_table_to_string(table, &data0);
 	data = data0;
 
-	p = strchr(data, '\n');
+	if (data && *data)
+		p = strchr(data, '\n');
 	if (p) {
 		/* print header in reverse mode */
 		*p = '\0';
@@ -191,7 +193,8 @@ static int update_screen(struct irqtop_ctl *ctl, struct irq_output *out)
 		data = p + 1;
 	}
 
-	irqtop_printf(ctl, "%s\n\n", data);
+	if (data && *data)
+		irqtop_printf(ctl, "%s\n\n", data);
 	free(data0);
 
 	/* clean up */