From: Jens Axboe <axboe@fb.com>
Date: Tue, 27 Oct 2015 09:33:23 +0000 (+0900)
Subject: stat: fix potential segfault for json output on network client
X-Git-Tag: fio-2.2.11~8
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=2de615ad34e323ec7c8f0f595ed4dc5124f99a42

stat: fix potential segfault for json output on network client

Fixes: b01af66b13f0 ("add eta and elapsed to root of json output")
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/stat.c b/stat.c
index 7fa601b7..2a65fed8 100644
--- a/stat.c
+++ b/stat.c
@@ -1083,9 +1083,10 @@ static struct json_object *show_thread_status_json(struct thread_stat *ts,
 
 	/* ETA Info */
 	je = get_jobs_eta(1, &size);
-	json_object_add_value_int(root, "eta", je->eta_sec);
-	json_object_add_value_int(root, "elapsed", je->elapsed_sec);
-
+	if (je) {
+		json_object_add_value_int(root, "eta", je->eta_sec);
+		json_object_add_value_int(root, "elapsed", je->elapsed_sec);
+	}
 
 	add_ddir_status_json(ts, rs, DDIR_READ, root);
 	add_ddir_status_json(ts, rs, DDIR_WRITE, root);