diff options
| author | zeripath <art27@cantab.net> | 2020-06-18 15:07:09 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-18 10:07:09 -0400 |
| commit | 654a97064495213531efdfc2571f659b45236633 (patch) | |
| tree | fa2f298c4b7c289d618940582515751189b4c0da /models | |
| parent | 1dd3f19ee381d3a3554828a37282fd75ba3073ee (diff) | |
| download | gitea-654a97064495213531efdfc2571f659b45236633.tar.gz gitea-654a97064495213531efdfc2571f659b45236633.zip | |
Fix commenting on non-utf8 encoded files (#11916)
* Add comment on non-unicode line to force fail
Signed-off-by: Andrew Thornton <art27@cantab.net>
* Just quote/unquote patch
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'models')
| -rw-r--r-- | models/issue_comment.go | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/models/issue_comment.go b/models/issue_comment.go index 7e940cbec4..452afc79f0 100644 --- a/models/issue_comment.go +++ b/models/issue_comment.go @@ -11,7 +11,9 @@ import ( "encoding/json" "fmt" "regexp" + "strconv" "strings" + "unicode/utf8" "code.gitea.io/gitea/modules/git" "code.gitea.io/gitea/modules/log" @@ -143,7 +145,8 @@ type Comment struct { RenderedContent string `xorm:"-"` // Path represents the 4 lines of code cemented by this comment - Patch string `xorm:"TEXT"` + Patch string `xorm:"-"` + PatchQuoted string `xorm:"TEXT patch"` CreatedUnix timeutil.TimeStamp `xorm:"INDEX created"` UpdatedUnix timeutil.TimeStamp `xorm:"INDEX updated"` @@ -199,6 +202,33 @@ func (c *Comment) loadIssue(e Engine) (err error) { return } +// BeforeInsert will be invoked by XORM before inserting a record +func (c *Comment) BeforeInsert() { + c.PatchQuoted = c.Patch + if !utf8.ValidString(c.Patch) { + c.PatchQuoted = strconv.Quote(c.Patch) + } +} + +// BeforeUpdate will be invoked by XORM before updating a record +func (c *Comment) BeforeUpdate() { + c.PatchQuoted = c.Patch + if !utf8.ValidString(c.Patch) { + c.PatchQuoted = strconv.Quote(c.Patch) + } +} + +// AfterLoad is invoked from XORM after setting the values of all fields of this object. +func (c *Comment) AfterLoad(session *xorm.Session) { + c.Patch = c.PatchQuoted + if len(c.PatchQuoted) > 0 && c.PatchQuoted[0] == '"' { + unquoted, err := strconv.Unquote(c.PatchQuoted) + if err == nil { + c.Patch = unquoted + } + } +} + func (c *Comment) loadPoster(e Engine) (err error) { if c.PosterID <= 0 || c.Poster != nil { return nil |