projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3d57c0e
)
stat: fix potential segfault for json output on network client
author
Jens Axboe
<axboe@fb.com>
Tue, 27 Oct 2015 09:33:23 +0000
(18:33 +0900)
committer
Jens Axboe
<axboe@fb.com>
Tue, 27 Oct 2015 09:33:23 +0000
(18:33 +0900)
Fixes:
b01af66b13f0
("add eta and elapsed to root of json output")
Signed-off-by: Jens Axboe <axboe@fb.com>
stat.c
patch
|
blob
|
blame
|
history
diff --git
a/stat.c
b/stat.c
index 7fa601b72d0c3b2e6c449040cbe97f1ea9f60e1d..2a65fed8fc2ebd61a8c4de3df97fff463fe3e23c 100644
(file)
--- 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);