]> git.ipfire.org Git - thirdparty/collectd.git/commitdiff
intel_pmu plugin: fix crash after specifying incorrect HardwareEvents names 3480/head
authorKamil Wiatrowski <kamilx.wiatrowski@intel.com>
Thu, 26 Mar 2020 13:34:10 +0000 (14:34 +0100)
committerKamil Wiatrowski <kamilx.wiatrowski@intel.com>
Wed, 17 Jun 2020 10:07:08 +0000 (11:07 +0100)
If HardwareEvents group consisted of events that can't be resolved collectd
could crash.

Change-Id: Ia66732037161bce5fbff73dc635eb40fd1ad8eed
Signed-off-by: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
src/intel_pmu.c

index 8216689d17581da212db492f2a8470adde789a3a..41975e7aba8176ff75c03bf998509a666f5b6974 100644 (file)
@@ -611,7 +611,7 @@ static int pmu_add_hw_events(struct eventlist *el, char **e, size_t count) {
     }
 
     /* Multiple events parsed in one entry */
-    if (group) {
+    if (group && group_events_count > 0) {
       /* Mark last added event as group end */
       el->eventlist_last->end_group = 1;
     }