summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStelios Fragkakis <52996999+stelfrag@users.noreply.github.com>2021-04-07 19:25:55 +0300
committerGitHub <noreply@github.com>2021-04-07 19:25:55 +0300
commitee64ef04f069247b0c402cfa722218e5187dfe11 (patch)
tree593c5f89e4c0a7559f81944ce3673d39e55e1327
parent81391f0b6c85b0afcad4529e69a3f21c8afd56bd (diff)
Fix memory corruption issue when executing context queries in RAM/SAVE memory mode (#10933)
-rw-r--r--web/api/formatters/rrd2json.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/web/api/formatters/rrd2json.c b/web/api/formatters/rrd2json.c
index 5b12c89bac..4344af4ac5 100644
--- a/web/api/formatters/rrd2json.c
+++ b/web/api/formatters/rrd2json.c
@@ -95,12 +95,8 @@ void build_context_param_list(struct context_param **param_list, RRDSET *st)
memcpy(rd->state, rd1->state, sizeof(*rd->state));
memcpy(&rd->state->collect_ops, &rd1->state->collect_ops, sizeof(struct rrddim_collect_ops));
memcpy(&rd->state->query_ops, &rd1->state->query_ops, sizeof(struct rrddim_query_ops));
-#ifdef ENABLE_DBENGINE
- if (rd->rrd_memory_mode == RRD_MEMORY_MODE_DBENGINE) {
- rd->state->metric_uuid = mallocz(sizeof(uuid_t));
- uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid);
- }
-#endif
+ rd->state->metric_uuid = mallocz(sizeof(uuid_t));
+ uuid_copy(*rd->state->metric_uuid, *rd1->state->metric_uuid);
rd->next = (*param_list)->rd;
(*param_list)->rd = rd;
}