caiyu/nextpnr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #248 from koriakin/bba-fix

Browse Source 
bba: Fix str with empty string.
This commit is contained in:
Clifford Wolf 2019-06-27 08:05:32 +02:00 committed by GitHub
commit 4f87bb5f99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
bba/main.cc
View File

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