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

bba: Fix str with empty string.

Browse Source 
Signed-off-by: Marcin Kościelnicki <marcin@symbioticeda.com>
This commit is contained in:
Marcin Kościelnicki 2019-03-12 18:18:56 +01:00
parent 97993e76ea
commit b1d345c233
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) {