diff options
| author | Sean McGivern <sean@gitlab.com> | 2017-07-20 16:16:00 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2017-07-20 16:39:51 +0300 |
| commit | 01112f4cae4f8711dc4e6574bbdc77b8dcbb4ebc (patch) | |
| tree | c46021043166c10af8cfeebb45f5eea57067097e /changelogs | |
| parent | 63d383e3db08747ff692e6bab62bc133744c211d (diff) | |
Merge branch 'fix-re2-infinite-loop-nick' into 'security-9-3'
Fix an infinite loop in Gitlab:UntrustedRegexp
See merge request !2146
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/unreleased/fix-re2-infinite-loop-nick.yml | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/unreleased/fix-re2-infinite-loop-nick.yml b/changelogs/unreleased/fix-re2-infinite-loop-nick.yml new file mode 100644 index 00000000000..3c314ab2718 --- /dev/null +++ b/changelogs/unreleased/fix-re2-infinite-loop-nick.yml @@ -0,0 +1,4 @@ +--- +title: Fix an infinite loop when handling user-supplied regular expressions +merge_request: +author: |