bba: Fix str with empty string.

Signed-off-by: Marcin Kościelnicki <marcin@symbioticeda.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/bba/main.cc b/bba/main.cc
index 263cf39e..0d4181c5 100644
--- a/bba/main.cc
+++ b/bba/main.cc
@@ -181,10 +181,11 @@ int main(int argc, char **argv)
 
         if (cmd == "str") {
             const char *value = skipWhitespace(strtok(nullptr, "\r\n"));
-            char terminator[2] = {*value, 0};
-            assert(terminator[0] != 0);
-            value = strtok((char *)value + 1, terminator);
-            const char *comment = skipWhitespace(strtok(nullptr, "\r\n"));
+            assert(*value != 0);
+            char *end = strchr((char *)value + 1, *value);
+            *end = 0;
+            value += 1;
+            const char *comment = skipWhitespace(strtok(end+1, "\r\n"));
             std::string label = std::string("str:") + value;
             Stream &s = streams.at(streamStack.back());
             if (labelIndex.count(label) == 0) {