forked from lix-project/lix
libexpr: Fix prim_replaceStrings() to work on an empty source string
Otherwise, running e.g. nix-instantiate --eval -E --strict 'builtins.replaceStrings [""] ["X"] "abc"' would just hang in an infinite loop. Found by afl-fuzz.
This commit is contained in:
parent
1d0e42879f
commit
4ea9707591
|
@ -1913,21 +1913,26 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar
|
||||||
auto s = state.forceString(*args[2], context, pos);
|
auto s = state.forceString(*args[2], context, pos);
|
||||||
|
|
||||||
string res;
|
string res;
|
||||||
for (size_t p = 0; p < s.size(); ) {
|
// Loops one past last character to handle the case where 'from' contains an empty string.
|
||||||
|
for (size_t p = 0; p <= s.size(); ) {
|
||||||
bool found = false;
|
bool found = false;
|
||||||
auto i = from.begin();
|
auto i = from.begin();
|
||||||
auto j = to.begin();
|
auto j = to.begin();
|
||||||
for (; i != from.end(); ++i, ++j)
|
for (; i != from.end(); ++i, ++j)
|
||||||
if (s.compare(p, i->size(), *i) == 0) {
|
if (s.compare(p, i->size(), *i) == 0) {
|
||||||
found = true;
|
found = true;
|
||||||
p += i->size();
|
|
||||||
res += j->first;
|
res += j->first;
|
||||||
|
if (i->empty()) {
|
||||||
|
res += s[p++];
|
||||||
|
} else {
|
||||||
|
p += i->size();
|
||||||
|
}
|
||||||
for (auto& path : j->second)
|
for (auto& path : j->second)
|
||||||
context.insert(path);
|
context.insert(path);
|
||||||
j->second.clear();
|
j->second.clear();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (!found) res += s[p++];
|
if (!found && p < s.size()) res += s[p++];
|
||||||
}
|
}
|
||||||
|
|
||||||
mkString(v, res, context);
|
mkString(v, res, context);
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
[ "faabar" "fbar" "fubar" "faboor" "fubar" ]
|
[ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" ]
|
||||||
|
|
|
@ -5,4 +5,6 @@ with builtins;
|
||||||
(replaceStrings ["oo"] ["u"] "foobar")
|
(replaceStrings ["oo"] ["u"] "foobar")
|
||||||
(replaceStrings ["oo" "a"] ["a" "oo"] "foobar")
|
(replaceStrings ["oo" "a"] ["a" "oo"] "foobar")
|
||||||
(replaceStrings ["oo" "oo"] ["u" "i"] "foobar")
|
(replaceStrings ["oo" "oo"] ["u" "i"] "foobar")
|
||||||
|
(replaceStrings [""] ["X"] "abc")
|
||||||
|
(replaceStrings [""] ["X"] "")
|
||||||
]
|
]
|
||||||
|
|
Loading…
Reference in a new issue