A more thorough fix to corruption of the depends property

This commit is contained in:
Dustin J. Mitchell 2022-01-17 22:11:01 +00:00 committed by Tomas Babej
parent 96d6c1df9f
commit 7321febe4f
2 changed files with 13 additions and 12 deletions

View file

@ -659,17 +659,18 @@ void Task::parse (const std::string& input)
data[name] = decode (json::decode (value));
// Fix for issue#2689: taskserver sometimes encodes the depends
// property as a JSON-encoded one-element array of strings. So, if
// depends has form `[".."]`, then apply another layer of JSON
// decoding.
if (name == "depends" && data[name].length () >= 4) {
auto l = data[name].length ();
if (data[name][0] == '[' &&
data[name][1] == '"' &&
data[name][l-2] == '"' &&
data[name][l-1] == ']') {
data[name] = data[name].substr(2, l-4);
// property as a JSON-encoded array of strings. To avoid this whole
// issue, we strip anything that isn't a UUID character or a comma.
if (name == "depends") {
std::string newDep;
for (auto &c: data[name]) {
if ((c >= '0' && c <= '9') ||
(c >= 'a' && c <= 'f') ||
c == ',' || c == '-') {
newDep.push_back(c);
}
}
data[name] = newDep;
}
}