aggregator_putmetric: do not accept new input when shutting down

grobian · Jul 14, 2016 · 0980c5e · 0980c5e
1 parent aa01ea3
commit 0980c5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -17,6 +17,8 @@
   race condition in aggregator leads to crash
 * [Issue #195](https://github.com/grobian/carbon-c-relay/issues/195)
   assertion fails when reloading config
+* [Issue #200](https://github.com/grobian/carbon-c-relay/issues/200)
+  use after free during shutdown in aggregator
 * [Issue #203](https://github.com/grobian/carbon-c-relay/issues/203)
   change default connection listen backlog
 

diff --git a/aggregator.c b/aggregator.c
@@ -193,6 +193,10 @@ aggregator_putmetric(
 	struct _aggr_bucket *bucket;
 	struct _aggr_bucket_entries *entries;
 
+	/* do not accept new values when shutting down, issue #200 */
+	if (!keep_running)
+		return;
+
 	/* get value */
 	if ((v = strchr(firstspace + 1, ' ')) == NULL) {
 		/* metric includes \n */