From: Kamil Wiatrowski <kamilx.wiatrowski@intel.com>
Date: Thu, 26 Mar 2020 13:34:10 +0000 (+0100)
Subject: intel_pmu plugin: fix crash after specifying incorrect HardwareEvents names
X-Git-Tag: collectd-5.12.0~32^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d24f7b1265b922b4d4bf30abfdb0631fcac2cd5;p=thirdparty%2Fcollectd.git

intel_pmu plugin: fix crash after specifying incorrect HardwareEvents names

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>
---

diff --git a/src/intel_pmu.c b/src/intel_pmu.c
index 8216689d1..41975e7ab 100644
--- a/src/intel_pmu.c
+++ b/src/intel_pmu.c
@@ -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;
     }