diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-19 17:52:33 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-26 19:49:13 +0200 |
| commit | 77e9e1ed91182cb8409d325e225a99decb49b3d5 (patch) | |
| tree | 26178762b948c9c64812a3aad90164de4f8a0df2 /tests | |
| parent | 24ec7500032c2434e450b7bc3f77ff4c1f12c41c (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.
First attempt of this was reverted in e2d71bd1862cdda because it caused
another infinite loop, which is fixed now and a test added.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/lang/eval-okay-replacestrings.exp | 2 | ||||
| -rw-r--r-- | tests/lang/eval-okay-replacestrings.nix | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/tests/lang/eval-okay-replacestrings.exp b/tests/lang/eval-okay-replacestrings.exp index a2add1b7b..72e8274d8 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" "a_b" ] diff --git a/tests/lang/eval-okay-replacestrings.nix b/tests/lang/eval-okay-replacestrings.nix index 6284a0e66..bd8031fc0 100644 --- a/tests/lang/eval-okay-replacestrings.nix +++ b/tests/lang/eval-okay-replacestrings.nix @@ -5,4 +5,7 @@ with builtins; (replaceStrings ["oo"] ["u"] "foobar") (replaceStrings ["oo" "a"] ["a" "oo"] "foobar") (replaceStrings ["oo" "oo"] ["u" "i"] "foobar") + (replaceStrings [""] ["X"] "abc") + (replaceStrings [""] ["X"] "") + (replaceStrings ["-"] ["_"] "a-b") ] |