From ee5ce1e90bca75985fac7553f091725bd06290c4 Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Mon, 2 May 2016 14:44:25 +0100 Subject: [PATCH] [Fix] Do not send NaN in json Issue: #615 Reported by: @moisseev --- src/controller.c | 21 ++++++++++++++++----- 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/src/controller.c b/src/controller.c index 542f197c3..06782e850 100644 --- a/src/controller.c +++ b/src/controller.c @@ -1100,17 +1100,28 @@ rspamd_controller_handle_graph ( for (i = start_row, cnt = 0; cnt < rrd_result->rra_rows; cnt ++) { for (j = 0; j < rrd_result->ds_count; j++) { + gdouble yval; + data_elt = ucl_object_typed_new (UCL_OBJECT); t = ts * rrd_result->pdp_per_cdp; ucl_object_insert_key (data_elt, ucl_object_fromint (t), "x", 1, false); - ucl_object_insert_key (data_elt, - ucl_object_fromdouble (rrd_result->data[i * - rrd_result->ds_count + j]), - "y", 1, - false); + yval = rrd_result->data[i * rrd_result->ds_count + j]; + + if (!isnan (yval)) { + ucl_object_insert_key (data_elt, + ucl_object_fromdouble (yval), + "y", 1, + false); + } + else { + ucl_object_insert_key (data_elt, + ucl_object_typed_new (UCL_NULL), + "y", 1, + false); + } ucl_array_append (elt[j], data_elt); } -- 2.39.5