diff options
author | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:33:36 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2015-08-17 23:33:36 +0000 |
commit | c9920c422d55680310cffcf34432d708de4bf207 (patch) | |
tree | 1e37ea6e18772ea8de89f0b8ba8032c2873c76ab /lib/gitlab | |
parent | f4cb6e438ab3cb03589c5ba36dc2b23c78b66c5a (diff) | |
parent | c36adb98aa62a0f22f6ed290589cd2faf108abc4 (diff) | |
download | gitlab-ce-c9920c422d55680310cffcf34432d708de4bf207.tar.gz |
Merge branch 'fix-backslashes-inline-diff' into 'master'
Fix bug where backslashes in inline diffs could be dropped
This MR fixes a bug in inline diff generation causing backslashes to be dropped. For example, the input:
```
input.to_s.sub(/[\r\n].+/,'').sub(/\\[rn].+/, '').strip
```
The second backslash is dropped in the second `sub` statement:
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/16e513894f7ecda1b111fe7d43e7f388/image.png)
With this fix, it looks like:
![image](https://gitlab.com/gitlab-org/gitlab-ce/uploads/90fd635a937a68f1b2403740ebc75e3a/image.png)
Closes #2253
See merge request !1143
Diffstat (limited to 'lib/gitlab')
-rw-r--r-- | lib/gitlab/inline_diff.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/gitlab/inline_diff.rb b/lib/gitlab/inline_diff.rb index 3517ecdf5cf..99e7b529ba9 100644 --- a/lib/gitlab/inline_diff.rb +++ b/lib/gitlab/inline_diff.rb @@ -46,8 +46,11 @@ module Gitlab end last_the_same_symbols += 1 last_token = first_line[last_the_same_symbols..-1] - diff_arr[index+1].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token) - diff_arr[index+2].sub!(/#{Regexp.escape(last_token)}$/, FINISH + last_token) + # This is tricky: escape backslashes so that `sub` doesn't interpret them + # as backreferences. Regexp.escape does NOT do the right thing. + replace_token = FINISH + last_token.gsub(/\\/, '\&\&') + diff_arr[index+1].sub!(/#{Regexp.escape(last_token)}$/, replace_token) + diff_arr[index+2].sub!(/#{Regexp.escape(last_token)}$/, replace_token) end diff_arr end |