From 6c79497f5f06b61977fef3a951c35f0ba6548752 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Wed, 22 Jan 2014 20:01:26 +0100 Subject: Add some input data validation when parsing the output histogram from cyclictest Backport of commit e0ca74e9c9f7f83a9db08d062b5ca8bdf05ff748 from v1.3x Signed-off-by: Clark Williams Signed-off-by: David Sommerseth --- rteval/modules/measurement/cyclictest.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/rteval/modules/measurement/cyclictest.py b/rteval/modules/measurement/cyclictest.py index 77acd22..a15f6e7 100644 --- a/rteval/modules/measurement/cyclictest.py +++ b/rteval/modules/measurement/cyclictest.py @@ -299,7 +299,15 @@ class Cyclictest(rtevalModulePrototype): self.__breaktraceval = int(line.split(':')[1]) continue + # Skipping blank lines + if len(line) == 0: + continue + vals = line.split() + if len(vals) == 0: + # If we don't have any values, don't try parsing + continue + index = int(vals[0]) for i in range(0, len(self.__cyclicdata)-1): if str(i) not in self.__cyclicdata: continue -- cgit