X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Frrdtool.c;h=bbebc375ffd1899a3d2b727817ade097e60d093a;hb=218635ab44a8533ef5b23fd1ae78be761ff0600c;hp=95bde6941e459b03b68ab29da00d31c6b03ab34b;hpb=56159e13f4b983a2e8c846b39ca96b2384ec746a;p=collectd.git

diff --git a/src/rrdtool.c b/src/rrdtool.c
index 95bde694..bbebc375 100644
--- a/src/rrdtool.c
+++ b/src/rrdtool.c
@@ -223,7 +223,7 @@ static int value_list_to_string (char *buffer, int buffer_len,
 } /* int value_list_to_string */
 
 static int value_list_to_filename (char *buffer, int buffer_len,
-		const data_set_t *ds, const value_list_t *vl)
+		const data_set_t __attribute__((unused)) *ds, const value_list_t *vl)
 {
 	int offset = 0;
 	int status;
@@ -266,7 +266,7 @@ static int value_list_to_filename (char *buffer, int buffer_len,
 	return (0);
 } /* int value_list_to_filename */
 
-static void *rrd_queue_thread (void *data)
+static void *rrd_queue_thread (void __attribute__((unused)) *data)
 {
         struct timeval tv_next_update;
         struct timeval tv_now;
@@ -279,14 +279,17 @@ static void *rrd_queue_thread (void *data)
 		rrd_cache_t *cache_entry;
 		char **values;
 		int    values_num;
+		int    status;
 		int    i;
 
+		values = NULL;
+		values_num = 0;
+
                 pthread_mutex_lock (&queue_lock);
                 /* Wait for values to arrive */
                 while (true)
                 {
                   struct timespec ts_wait;
-                  int status;
 
                   while ((flushq_head == NULL) && (queue_head == NULL)
                       && (do_shutdown == 0))
@@ -361,17 +364,28 @@ static void *rrd_queue_thread (void *data)
 		 * we make a copy of it's values */
 		pthread_mutex_lock (&cache_lock);
 
-		c_avl_get (cache, queue_entry->filename, (void *) &cache_entry);
+		status = c_avl_get (cache, queue_entry->filename,
+				(void *) &cache_entry);
 
-		values = cache_entry->values;
-		values_num = cache_entry->values_num;
+		if (status == 0)
+		{
+			values = cache_entry->values;
+			values_num = cache_entry->values_num;
 
-		cache_entry->values = NULL;
-		cache_entry->values_num = 0;
-		cache_entry->flags = FLAG_NONE;
+			cache_entry->values = NULL;
+			cache_entry->values_num = 0;
+			cache_entry->flags = FLAG_NONE;
+		}
 
 		pthread_mutex_unlock (&cache_lock);
 
+		if (status != 0)
+		{
+			sfree (queue_entry->filename);
+			sfree (queue_entry);
+			continue;
+		}
+
 		/* Update `tv_next_update' */
 		if (write_rate > 0.0) 
                 {
@@ -625,6 +639,15 @@ static int rrd_cache_insert (const char *filename,
 
 	pthread_mutex_lock (&cache_lock);
 
+	/* This shouldn't happen, but it did happen at least once, so we'll be
+	 * careful. */
+	if (cache == NULL)
+	{
+		pthread_mutex_unlock (&cache_lock);
+		WARNING ("rrdtool plugin: cache == NULL.");
+		return (-1);
+	}
+
 	c_avl_get (cache, filename, (void *) &rc);
 
 	if (rc == NULL)