|
 |
83c8ee |
From ce90f916fee2a39eb914f8b6b349adb76d100f75 Mon Sep 17 00:00:00 2001
|
|
|
83c8ee |
From: Sebastien GODARD <sysstat@users.noreply.github.com>
|
|
|
83c8ee |
Date: Sat, 13 Apr 2019 18:44:29 +0200
|
|
|
83c8ee |
Subject: [PATCH] sadf: Fix seg fault on empty data files
|
|
|
83c8ee |
|
|
|
83c8ee |
Trying to display XML or JSON data (with sadf -x/-j) from a data file
|
|
|
83c8ee |
containing only RESTART records created a core dump.
|
|
|
83c8ee |
This patch fixes that.
|
|
|
83c8ee |
|
|
|
83c8ee |
Signed-off-by: Sebastien GODARD <sysstat@users.noreply.github.com>
|
|
|
83c8ee |
---
|
|
|
83c8ee |
sadf.c | 7 ++++---
|
|
|
83c8ee |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
83c8ee |
|
|
|
83c8ee |
diff --git a/sadf.c b/sadf.c
|
|
|
83c8ee |
index 2d2c39c..5d558d3 100644
|
|
|
83c8ee |
--- a/sadf.c
|
|
|
83c8ee |
+++ b/sadf.c
|
|
|
83c8ee |
@@ -963,14 +963,15 @@ void logic1_display_loop(int ifd, struct file_activity *file_actlst, char *file,
|
|
|
83c8ee |
(tm_start.use && (datecmp(loctime, &tm_start) < 0)) ||
|
|
|
83c8ee |
(tm_end.use && (datecmp(loctime, &tm_end) >= 0))));
|
|
|
83c8ee |
|
|
|
83c8ee |
- /* Save the first stats collected. Used for example in next_slice() function */
|
|
|
83c8ee |
- copy_structures(act, id_seq, record_hdr, 2, 0);
|
|
|
83c8ee |
-
|
|
|
83c8ee |
curr = 1;
|
|
|
83c8ee |
cnt = count;
|
|
|
83c8ee |
reset = TRUE;
|
|
|
83c8ee |
|
|
|
83c8ee |
if (!eosaf) {
|
|
|
83c8ee |
+
|
|
|
83c8ee |
+ /* Save the first stats collected. Used for example in next_slice() function */
|
|
|
83c8ee |
+ copy_structures(act, id_seq, record_hdr, 2, 0);
|
|
|
83c8ee |
+
|
|
|
83c8ee |
do {
|
|
|
83c8ee |
eosaf = read_next_sample(ifd, IGNORE_COMMENT | IGNORE_RESTART, curr,
|
|
|
83c8ee |
file, &rtype, tab, file_magic, file_actlst,
|
|
|
83c8ee |
--
|
|
|
83c8ee |
2.31.1
|
|
|
83c8ee |
|