Merge pull request syslog-ng#5124 from HofiOne/leak-fixes

Various memory leak fixes

Author: HofiOne

lib/logsource.c

@@ -752,6 +752,8 @@ _set_metric_options(LogSource *self, const gchar *stats_id, StatsClusterKeyBuild
                                                self->stats_id, instance_name);
     stats_cluster_key_builder_set_legacy_alias_name(self->metrics.stats_kb, "processed");
     stats_cluster_key_builder_add_label(self->metrics.stats_kb, stats_cluster_label("id", self->stats_id));
+    if (self->metrics.recvd_messages_key)
+      stats_cluster_key_free(self->metrics.recvd_messages_key);
     self->metrics.recvd_messages_key = stats_cluster_key_builder_build_single(self->metrics.stats_kb);
   }
   stats_cluster_key_builder_pop(self->metrics.stats_kb);
@@ -760,6 +762,8 @@ _set_metric_options(LogSource *self, const gchar *stats_id, StatsClusterKeyBuild
   {
     stats_cluster_key_builder_set_name(self->metrics.stats_kb, "input_event_bytes_total");;
     stats_cluster_key_builder_add_label(self->metrics.stats_kb, stats_cluster_label("id", self->stats_id));
+    if (self->metrics.recvd_bytes_key)
+      stats_cluster_key_free(self->metrics.recvd_bytes_key);
     self->metrics.recvd_bytes_key = stats_cluster_key_builder_build_single(self->metrics.stats_kb);
   }
   stats_cluster_key_builder_pop(self->metrics.stats_kb);

lib/logthrdest/logthrdestdrv.c

@@ -1324,6 +1324,15 @@ _unregister_driver_stats(LogThreadedDestDriver *self)
         stats_cluster_key_free(self->metrics.processed_sc_key);
         self->metrics.processed_sc_key = NULL;
       }
+
+    if (self->metrics.output_event_retries_sc_key)
+      {
+        stats_unregister_counter(self->metrics.output_event_retries_sc_key, SC_TYPE_SINGLE_VALUE,
+                                 &self->metrics.output_event_retries);
+
+        stats_cluster_key_free(self->metrics.output_event_retries_sc_key);
+        self->metrics.output_event_retries_sc_key = NULL;
+      }
   }
   stats_unlock();
 }

lib/metrics/dyn-metrics-template.c

@@ -164,6 +164,7 @@ dyn_metrics_template_clone(DynMetricsTemplate *self, GlobalConfig *cfg)
       LabelTemplate *label_template = (LabelTemplate *) elem->data;
       cloned->label_templates = g_list_append(cloned->label_templates, label_template_clone(label_template));
     }
+  value_pairs_unref(cloned->vp);
   cloned->vp = value_pairs_ref(self->vp);
   return cloned;
 }

lib/pragma-grammar.ym

@@ -190,6 +190,7 @@ requires_stmt
                               evt_tag_str("details", $3 ? : "none"),
                               cfg_lexer_format_location_tag(lexer,&@1));
                     free($2);
+                    free($3);
                     PRAGMA_ERROR();
                   }
                 else
@@ -201,6 +202,7 @@ requires_stmt
                   }
               }
             free($2);
+            free($3);
           }
 	;
 

modules/metrics-probe/metrics-probe.c

@@ -157,6 +157,7 @@ _clone(LogPipe *s)
   MetricsProbe *cloned = (MetricsProbe *) metrics_probe_new(s->cfg);
 
   log_parser_clone_settings(&self->super, &cloned->super);
+  dyn_metrics_template_free(cloned->metrics_template);
   cloned->metrics_template = dyn_metrics_template_clone(self->metrics_template, s->cfg);
 
   metrics_probe_set_increment_template(&cloned->super, self->increment_template);