From b1d345c23379c62f809013634c8df11719ea00cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcin=20Ko=C5=9Bcielnicki?= Date: Tue, 12 Mar 2019 18:18:56 +0100 Subject: bba: Fix str with empty string. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Marcin Kościelnicki --- bba/main.cc | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'bba') 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) { -- cgit v1.2.3