diff options
author | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 17:03:39 +0000 |
---|---|---|
committer | GitLab Release Tools Bot <robert+release-tools@gitlab.com> | 2019-11-26 17:03:39 +0000 |
commit | ef6512ad8f7fc86ab67f210b6ca2754790e4564f (patch) | |
tree | 8d9ea54cf3da9939592d14a1208cf262dd67a199 /lib | |
parent | 79a183ea8dee98900cfb495611c3342f6f312df0 (diff) | |
parent | 5bdc90c2799db3fdabe8cd95c7a194c3ef825873 (diff) | |
download | gitlab-ce-ef6512ad8f7fc86ab67f210b6ca2754790e4564f.tar.gz |
Merge branch 'security-dos-issue-and-commit-comments-12-5' into '12-5-stable'
Fix invalid byte sequence
See merge request gitlab/gitlabhq!3547
Diffstat (limited to 'lib')
-rw-r--r-- | lib/banzai/filter/relative_link_filter.rb | 2 |
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) |