diff options
| author | Clifford Wolf <clifford@clifford.at> | 2019-06-27 08:05:32 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-27 08:05:32 +0200 |
| commit | 4f87bb5f9930736a8a2065c300bc686ca7d5d53f (patch) | |
| tree | 52be2e700c3eb40da9401b8a7dda0d9f3ed62349 | |
| parent | e78ed1142160b62b870f0722f52f77dd8b27d903 (diff) | |
| parent | b1d345c23379c62f809013634c8df11719ea00cd (diff) | |
| download | nextpnr-4f87bb5f9930736a8a2065c300bc686ca7d5d53f.tar.gz nextpnr-4f87bb5f9930736a8a2065c300bc686ca7d5d53f.tar.bz2 nextpnr-4f87bb5f9930736a8a2065c300bc686ca7d5d53f.zip | |
Merge pull request #248 from koriakin/bba-fix
bba: Fix str with empty string.
| -rw-r--r-- | bba/main.cc | 9 |
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) { |