From: collectd bot <32910397+collectd-bot@users.noreply.github.com>
Date: Thu, 11 Oct 2018 06:02:46 +0000 (+0200)
Subject: Auto-Merge pull request #2948 from rubenk/turbostat-free-the-right-vars
X-Git-Url: https://git.octo.it/?p=collectd.git;a=commitdiff_plain;h=4483e383ce5a1bbef69311a62047703758664d32;hp=0684aea7453186e6f90ce4b6b8c5bcca68f0d1b9

Auto-Merge pull request #2948 from rubenk/turbostat-free-the-right-vars

Automatically merged due to "Automerge" label
---

diff --git a/src/turbostat.c b/src/turbostat.c
index e4419b85..f3885158 100644
--- a/src/turbostat.c
+++ b/src/turbostat.c
@@ -586,7 +586,8 @@ static int submit_counters(struct thread_data *t, struct core_data *c,
   /* If not using logical core numbering, set core id */
   if (!config_lcn) {
     if (topology.num_packages > 1)
-      snprintf(name, sizeof(name), "pkg%02d-core%02d", p->package_id, c->core_id);
+      snprintf(name, sizeof(name), "pkg%02d-core%02d", p->package_id,
+               c->core_id);
     else
       snprintf(name, sizeof(name), "core%02d", c->core_id);
   }
@@ -1287,15 +1288,15 @@ static int allocate_counters(struct thread_data **threads,
   *cores = calloc(total_cores, sizeof(struct core_data));
   if (*cores == NULL) {
     ERROR("turbostat plugin: calloc failed");
-    sfree(threads);
+    sfree(*threads);
     return -1;
   }
 
   *packages = calloc(topology.num_packages, sizeof(struct pkg_data));
   if (*packages == NULL) {
     ERROR("turbostat plugin: calloc failed");
-    sfree(cores);
-    sfree(threads);
+    sfree(*cores);
+    sfree(*threads);
     return -1;
   }