Fix crash on empty string

master
Geoffrey Merck 4 years ago
parent eca0f43671
commit a40e79ffdd

@ -49,17 +49,16 @@ m_locks()
char * lineDup = strdup(line.c_str()); char * lineDup = strdup(line.c_str());
char * t = std::strtok(lineDup, delimiters.c_str()); char * t = std::strtok(lineDup, delimiters.c_str());
std::string name(t); std::string name(t != NULL ? t : "");
t = std::strtok(NULL, delimiters.c_str()); t = std::strtok(NULL, delimiters.c_str());
std::string address(t); std::string address(t != NULL ? t : "");
t = std::strtok(NULL, delimiters.c_str()); t = std::strtok(NULL, delimiters.c_str());
std::string lock(t); std::string lock(t != NULL ? t : "");
free(lineDup); free(lineDup);
name.resize(LONG_CALLSIGN_LENGTH, ' ');
if (!name.empty() && !address.empty()) { if (!name.empty() && !address.empty()) {
name.resize(LONG_CALLSIGN_LENGTH, ' ');
m_names.push_back(name); m_names.push_back(name);
m_addresses.push_back(address); m_addresses.push_back(address);
m_locks.push_back(!lock.empty()); m_locks.push_back(!lock.empty());

Loading…
Cancel
Save

Powered by TurnKey Linux.