Llewellyn/conky
1
0
Fork 0
mirror of https://github.com/Llewellynvdm/conky.git synced 2024-12-29 05:12:41 +00:00
Code Issues Releases Activity

Another off-by-one found by valgrind.

Browse Source
This commit is contained in:
Pavel Labath 2010-01-17 19:35:35 +01:00
parent e840dcdd5b
commit ae4be102b6
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/specials.cc
View File

@ -38,6 +38,7 @@
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif /* HAVE_SYS_PARAM_H */ #endif /* HAVE_SYS_PARAM_H */
#include <algorithm>
/* maximum number of special things, e.g. fonts, offsets, aligns, etc. */ /* maximum number of special things, e.g. fonts, offsets, aligns, etc. */
int max_specials = MAX_SPECIALS_DEFAULT; int max_specials = MAX_SPECIALS_DEFAULT;
@ -350,18 +351,19 @@ static void graph_append(struct special_t *graph, double f, char showaslog)
f = graph->scale; f = graph->scale;
} }
graph->graph[0] = f; /* add new data */
/* shift all the data by 1 */ /* shift all the data by 1 */
for (i = graph->graph_width - 1; i > 0; i--) { for (i = graph->graph_width - 1; i > 0; i--) {
graph->graph[i] = graph->graph[i - 1]; graph->graph[i] = graph->graph[i - 1];
if (graph->scaled && graph->graph[i - 1] > graph->scale) {
/* check if we need to update the scale */
graph->scale = graph->graph[i - 1];
}
} }
if (graph->scaled && graph->graph[graph->graph_width] > graph->scale) { graph->graph[0] = f; /* add new data */
/* check if we need to update the scale */
graph->scale = graph->graph[graph->graph_width]; if(graph->scaled) {
graph->scale = *std::max_element(graph->graph + 0, graph->graph + graph->graph_width);
if(graph->scale < 1e-47) {
/* avoid NaN's when the graph is all-zero (e.g. before the first update)
* there is nothing magical about 1e-47 here */
graph->scale = 1e-47;
}
} }
} }