Merge branch 'release/1.1.3'

redBorder · Apr 11, 2017 · 6530f11 · 6530f11
2 parents 88cc54f + 9574156
commit 6530f11
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/f2k.c b/f2k.c
@@ -926,6 +926,7 @@ static bool parse_kafka_broker_topic_arg(const char *const_arg,
   char *config = NULL;
   asprintf(&config, "metadata.broker.list=%s", broker);
   parse_kafka_config(rk_conf, NULL, config);
+  free(config);
 
   *ret_topic = strdup(topic);
   return true;
@@ -2484,6 +2485,13 @@ int main(int argc, char *argv[]) {
 
   shutdown_f2k();
 
+  if (NULL != readOnlyGlobals.kafka_discarder.rkt) {
+    rd_kafka_topic_destroy(readOnlyGlobals.kafka_discarder.rkt);
+  }
+  if (NULL != readOnlyGlobals.kafka_discarder.rk) {
+    rd_kafka_destroy(readOnlyGlobals.kafka_discarder.rk);
+  }
+
   return(0);
 }
 

diff --git a/rb_sensor.c b/rb_sensor.c
@@ -1372,7 +1372,10 @@ static void rb_sensor_delete(struct sensor *sensor) {
     observation_id_decref(node);
 	}
 
-  observation_id_decref(sensor->default_observation_id);
+  if(NULL != sensor->default_observation_id) {
+    observation_id_decref(sensor->default_observation_id);
+  }
+
 	free(sensor);
 }