Add better error checking for inline html diff code #13239
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A better fix for go-gitea#13191 which cleans up this code a bit and adds basic checking which should avoid writing broken HTML in future situations.
zeripath
approved these changes
Oct 21, 2020
GiteaBot
added
the
lgtm/need 1
lafriks
approved these changes
Oct 21, 2020
GiteaBot
added
lgtm/done
Codecov Report
@@ Coverage Diff @@
## master #13239 +/- ##
==========================================
+ Coverage 42.21% 42.22% +0.01%
==========================================
Files 683 683
Lines 75458 75450 -8
==========================================
+ Hits 31851 31860 +9
+ Misses 38382 38369 -13
+ Partials 5225 5221 -4
Continue to review full report at Codecov.
|
|
please send backport :) |
mrsdizzie
added a commit
to mrsdizzie/gitea
that referenced
this pull request
Oct 21, 2020
* Add better error checking for inline html diff code A better fix for go-gitea#13191 which cleans up this code a bit and adds basic checking which should avoid writing broken HTML in future situations. * Update gitdiff_test.go * better regex Co-authored-by: techknowlogick <techknowlogick@gitea.io>
techknowlogick
pushed a commit
that referenced
this pull request
Oct 22, 2020
* Fix error in diff html rendering (#13191) * Fix error in diff html rendering Was missing an optional whitespace check in regex. Also noticed a rare case where diff.Type == Equal would be empty and thus get a newline attached. Fixed that too. Fixes #13177 * Update services/gitdiff/gitdiff.go Co-authored-by: zeripath <art27@cantab.net> * Update gitdiff_test.go * fmt Co-authored-by: zeripath <art27@cantab.net> * Add better error checking for inline html diff code (#13239) * Add better error checking for inline html diff code A better fix for #13191 which cleans up this code a bit and adds basic checking which should avoid writing broken HTML in future situations. * Update gitdiff_test.go * better regex Co-authored-by: zeripath <art27@cantab.net>
|
Please send backport |
mrsdizzie
added
backport/done
|
@lafriks already done : ) |
|
keep the backport label so we know what it was backported to. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
A better fix for #13191 which cleans up this code a bit and adds basic checking which should avoid ever writing broken HTML in future situations.