Fio 1.99.5

[fio.git] / server.c

diff --git a/server.c b/server.c
index ac6c2fb8969da75f15c05def7e313f01ca162137..dcce37eea822be362221aa9867733b638c446706 100644 (file)
--- a/server.c
+++ b/server.c
@@ -409,7 +409,10 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
        size_t size;
        int i;
 
-       size = sizeof(*je) + thread_number * sizeof(char);
+       if (!thread_number)
+               return 0;
+
+       size = sizeof(*je) + thread_number * sizeof(char) + 1;
        je = malloc(size);
        memset(je, 0, size);
 
@@ -668,9 +671,10 @@ void fio_server_send_ts(struct thread_stat *ts, struct group_run_stats *rs)
        p.ts.clat_percentiles   = cpu_to_le64(ts->clat_percentiles);
 
        for (i = 0; i < FIO_IO_U_LIST_MAX_LEN; i++) {
-               fio_fp64_t *fp = &p.ts.percentile_list[i];
+               fio_fp64_t *src = &ts->percentile_list[i];
+               fio_fp64_t *dst = &p.ts.percentile_list[i];
 
-               fp->u.i = __cpu_to_le64(fio_double_to_uint64(fp->u.f));
+               dst->u.i = __cpu_to_le64(fio_double_to_uint64(src->u.f));
        }
 
        for (i = 0; i < FIO_IO_U_MAP_NR; i++) {