Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-02-05 05:28:32 +00:00
Code Issues Releases Activity

Fix graph leak and the uninitialized values (#858)

Browse Source 
Signed-off-by: Joseph Benden <joe@benden.us>
This commit is contained in:
Joseph Benden 2019-07-08 03:29:58 -07:00 committed by lasers
parent 27ae07c2ae
commit afd5594a1f
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/specials.cc
View File

@ -508,7 +508,8 @@ graph_buf_end:
}
double *copy_graph(double *original_graph, int graph_width) {
double *new_graph = new double[graph_width];
double *new_graph =
static_cast<double *>(malloc(graph_width * sizeof(double)));
memcpy(new_graph, original_graph, graph_width * sizeof(double));
@ -517,7 +518,7 @@ double *copy_graph(double *original_graph, int graph_width) {
double *retrieve_graph(int graph_id, int graph_width) {
if (graphs.find(graph_id) == graphs.end()) {
return new double[graph_width];
return static_cast<double *>(calloc(1, graph_width * sizeof(double)));
} else {
return copy_graph(graphs[graph_id], graph_width);
}
@ -527,7 +528,8 @@ void store_graph(int graph_id, struct special_t *s) {
if (s->graph == nullptr) {
graphs[graph_id] = nullptr;
} else {
graphs[graph_id] = copy_graph(s->graph, s->graph_width);
if (graphs.find(graph_id) != graphs.end()) { free(graphs[graph_id]); }
graphs[graph_id] = s->graph;
}
}
@ -572,6 +574,7 @@ void new_graph(struct text_object *obj, char *buf, int buf_max_size,
}
s->graph = graph;
s->graph_allocated = s->graph_width;
graphs[g->id] = graph;
}
s->height = g->height;
s->first_colour = adjust_colours(g->first_colour);