From 4200bbad421b96ca97b4b819f33d073bd3ec4974 Mon Sep 17 00:00:00 2001
From: Luca Giacchino <luca.giacchino@intel.com>
Date: Tue, 28 Nov 2023 21:23:01 -0800
Subject: [PATCH] Fix vector option parsing

---
 options/options_formatter.cc | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/options/options_formatter.cc b/options/options_formatter.cc
index c9a0d47688..16d624e082 100644
--- a/options/options_formatter.cc
+++ b/options/options_formatter.cc
@@ -194,11 +194,20 @@ Status DefaultOptionsFormatter::ToVector(
     const std::string& opts_str, char separator,
     std::vector<std::string>* elems) const {
   Status status;
+
+  // If the input string starts and ends with "{{...}}", strip off the outer
+  // brackets
+  std::string opts = opts_str;
+  while (opts.size() > 4 && opts[0] == '{' && opts[1] == '{' &&
+         opts[opts.size() - 2] == '}' && opts[opts.size() - 1] == '}') {
+    opts = trim(opts.substr(1, opts.size() - 2));
+  }
+
   for (size_t start = 0, end = 0;
-       status.ok() && start < opts_str.size() && end != std::string::npos;
+       status.ok() && start < opts.size() && end != std::string::npos;
        start = end + 1) {
     std::string token;
-    status = NextToken(opts_str, separator, start, &end, &token);
+    status = NextToken(opts, separator, start, &end, &token);
     if (status.ok()) {
       elems->emplace_back(token);
     }