diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-19 17:52:33 +0200 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-19 23:20:26 +0200 |
commit | 4ea9707591beceacf9988b3c185faf50da238403 (patch) | |
tree | 638c7c3572b6fd3801191aa318e4a86655071000 /tests | |
parent | 1d0e42879fa687a7b6856b1a63070e44bd8ed5c4 (diff) |
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.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/lang/eval-okay-replacestrings.exp | 2 | ||||
-rw-r--r-- | tests/lang/eval-okay-replacestrings.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/lang/eval-okay-replacestrings.exp index a2add1b7b..590c281ac 100644 --- a/tests/lang/eval-okay-replacestrings.exp +++ b/tests/lang/eval-okay-replacestrings.exp @@ -1 +1 @@ -[ "faabar" "fbar" "fubar" "faboor" "fubar" ] +[ "faabar" "fbar" "fubar" "faboor" "fubar" "XaXbXcX" "X" ] diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/lang/eval-okay-replacestrings.nix index 6284a0e66..c84e9269f 100644 --- a/tests/lang/eval-okay-replacestrings.nix +++ b/tests/lang/eval-okay-replacestrings.nix @@ -5,4 +5,6 @@ with builtins; (replaceStrings ["oo"] ["u"] "foobar") (replaceStrings ["oo" "a"] ["a" "oo"] "foobar") (replaceStrings ["oo" "oo"] ["u" "i"] "foobar") + (replaceStrings [""] ["X"] "abc") + (replaceStrings [""] ["X"] "") ] |