diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libexpr/primops.cc | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index ab9351f11..a800d2429 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -1913,26 +1913,21 @@ static void prim_replaceStrings(EvalState & state, const Pos & pos, Value * * ar auto s = state.forceString(*args[2], context, pos); string res; - // Loops one past last character to handle the case where 'from' contains an empty string. - for (size_t p = 0; p <= s.size(); ) { + for (size_t p = 0; p < s.size(); ) { bool found = false; auto i = from.begin(); auto j = to.begin(); for (; i != from.end(); ++i, ++j) if (s.compare(p, i->size(), *i) == 0) { found = true; + p += i->size(); res += j->first; - if (i->empty()) { - res += s[p++]; - } else { - p += i->size(); - } for (auto& path : j->second) context.insert(path); j->second.clear(); break; } - if (!found && p < s.size()) res += s[p++]; + if (!found) res += s[p++]; } mkString(v, res, context); |