summaryrefslogtreecommitdiff
path: root/spec
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-01-06 19:18:04 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-01-06 19:18:04 +0000
commitbd200951d7e928b84bd5b4ef1210a56d688a03c9 (patch)
tree498c9c8307267ae7b58ed7798120de9f6eaa9524 /spec
parent19e2b7faf7439992f9d91f4b053d25d956f3e83a (diff)
downloadgitlab-ce-bd200951d7e928b84bd5b4ef1210a56d688a03c9.tar.gz
Add latest changes from gitlab-org/security/gitlab@13-7-stable-ee
Diffstat (limited to 'spec')
-rw-r--r--spec/lib/gitlab/regex_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index ebb37f45b95..776ca81a338 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -292,6 +292,12 @@ RSpec.describe Gitlab::Regex do
it { is_expected.not_to match('my package name') }
it { is_expected.not_to match('!!()()') }
it { is_expected.not_to match("..\n..\foo") }
+
+ it 'has no backtracking issue' do
+ Timeout.timeout(1) do
+ expect(subject).not_to match("-" * 50000 + ";")
+ end
+ end
end
describe '.maven_file_name_regex' do