ReportError(error, &out);
return;
}
- LoggerD("Alias name: %s", name);
- char* saveptr = nullptr;
- char* tokenized = strtok_r(name, kSpace.c_str(), &saveptr);
- if (nullptr != tokenized) {
- obj["packageId"] = picojson::value(tokenized);
- }
+ LoggerD("Alias name: %s", name);
- tokenized = strtok_r(nullptr, kSpace.c_str(), &saveptr);
- if (nullptr != tokenized) {
- obj["name"] = picojson::value(tokenized);
+ auto separator = strstr(name, kSpace.c_str());
+ if (separator != NULL && strlen(name) > separator - name + kSpace.size()) {
+ std::string packageId(name, separator);
+ obj["packageId"] = picojson::value(std::move(packageId));
+ obj["name"] = picojson::value(&separator[kSpace.size()]);
}
bool is_password_protected = false;