mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'dezgeg/afl-fixes'

Browse source
This commit is contained in:
Shea Levy 2018-02-20 16:32:48 -05:00
commit 7c377dc5cc
No known key found for this signature in database
GPG key ID: 5C0BD6957D86FE27
5 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/libexpr/primops.cc
View file

@ -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);

3
src/libutil/hash.cc
View file

@ -189,7 +189,8 @@ Hash::Hash(const std::string & s, HashType type)
else if (size == base64Len()) { else if (size == base64Len()) {
auto d = base64Decode(std::string(s, pos)); auto d = base64Decode(std::string(s, pos));
assert(d.size() == hashSize); if (d.size() != hashSize)
throw BadHash("invalid base-64 hash '%s'", s);
memcpy(hash, d.data(), hashSize); memcpy(hash, d.data(), hashSize);
} }

2
src/libutil/util.cc
View file

@ -1216,7 +1216,7 @@ std::string filterANSIEscapes(const std::string & s, unsigned int width)
else if (*i == '\r') else if (*i == '\r')
// do nothing for now // do nothing for now
; i++;
else { else {
t += *i++; w++; t += *i++; w++;

2
tests/lang/eval-okay-replacestrings.exp
View file

@ -1 +1 @@
[ "faabar" "fbar" "fubar" "faboor" "fubar" ] [ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" ]

2
tests/lang/eval-okay-replacestrings.nix
View file

@ -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"] "")
] ]