COMPMID-415: Fix list commandline options

Change-Id: I72f2552cc9809d4c5b053733b8e326c5aed72bc0
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/86115
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

1 files changed, 10 insertions, 10 deletions

diff --git a/framework/command_line/ListOption.h b/framework/command_line/ListOption.h
index f867ef804c..8b1bb3d05a 100644
--- a/framework/command_line/ListOption.h
+++ b/framework/command_line/ListOption.h
@@ -69,28 +69,28 @@ inline ListOption<T>::ListOption(std::string name, std::initializer_list<T> &&de
 template <typename T>
 bool ListOption<T>::parse(std::string value)
 {
+    _is_set = true;
+
     try
     {
         std::stringstream stream{ value };
-        T                 typed_value{};
+        std::string       item;
 
-        while(stream.good())
+        while(!std::getline(stream, item, ',').fail())
         {
-            stream >> typed_value;
+            std::stringstream item_stream(item);
+            T                 typed_value{};
+
+            item_stream >> typed_value;
 
-            if(!stream.fail())
+            if(!item_stream.fail())
             {
                 _values.emplace_back(typed_value);
             }
 
-            if(!stream.eof())
-            {
-                stream.ignore(1, ',');
-            }
+            _is_set = _is_set && !item_stream.fail();
         }
 
-        _is_set = !stream.fail();
-
         return _is_set;
     }
     catch(const std::invalid_argument &)