Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 20:03:32 +0300
committerGitLab Release Tools Bot <robert+release-tools@gitlab.com>2019-11-26 20:03:32 +0300
commit8539ed88d6e8e5da73486422f1a8ff623830a4ef (patch)
tree7871fa7c5bf1a5b362b5727fa1c4c7eaf88c1ecf /lib
parentf9db08fde1a1b3c54c0115ca853f83c70727e0d8 (diff)
parent0cc8e0210a081bd7db0bc0ef2b1e56cf3f55ae95 (diff)
Merge branch 'security-dos-issue-and-commit-comments-12-4' into '12-4-stable'
Fix invalid byte sequence See merge request gitlab/gitlabhq!3548
Diffstat (limited to 'lib')
-rw-r--r--lib/banzai/filter/relative_link_filter.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/banzai/filter/relative_link_filter.rb b/lib/banzai/filter/relative_link_filter.rb
index c7589e69262..583b0081319 100644
--- a/lib/banzai/filter/relative_link_filter.rb
+++ b/lib/banzai/filter/relative_link_filter.rb
@@ -172,7 +172,7 @@ module Banzai
end
def cleaned_file_path(uri)
- Addressable::URI.unescape(uri.path).delete("\0").chomp("/")
+ Addressable::URI.unescape(uri.path).scrub.delete("\0").chomp("/")
end
def relative_file_path(uri)