diff options
| author | Ethan Koenig <ethantkoenig@gmail.com> | 2018-02-10 10:19:26 -0800 |
|---|---|---|
| committer | Lauris BH <lauris@nix.lv> | 2018-02-10 20:19:26 +0200 |
| commit | 6eaeb01ecf1471517bbd4882ab7450f4f45a6f1c (patch) | |
| tree | e5cec22453b75a1a3503ed4061b291510f8ae2f4 /models/git_diff.go | |
| parent | 58771acacbe33b8725397f99b5a5340d5cfbd1e8 (diff) | |
| download | gitea-6eaeb01ecf1471517bbd4882ab7450f4f45a6f1c.tar.gz gitea-6eaeb01ecf1471517bbd4882ab7450f4f45a6f1c.zip | |
Update code.gitea.io/git (#3482)
Diffstat (limited to 'models/git_diff.go')
| -rw-r--r-- | models/git_diff.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/models/git_diff.go b/models/git_diff.go index 9e361d05f5..7b0b672ff1 100644 --- a/models/git_diff.go +++ b/models/git_diff.go @@ -14,6 +14,7 @@ import ( "io/ioutil" "os" "os/exec" + "strconv" "strings" "code.gitea.io/git" @@ -368,8 +369,15 @@ func ParsePatch(maxLines, maxLineCharacters, maxFiles int, reader io.Reader) (*D a := line[beg+2 : middle] b := line[middle+3:] if hasQuote { - a = string(git.UnescapeChars([]byte(a[1 : len(a)-1]))) - b = string(git.UnescapeChars([]byte(b[1 : len(b)-1]))) + var err error + a, err = strconv.Unquote(a) + if err != nil { + return nil, fmt.Errorf("Unquote: %v", err) + } + b, err = strconv.Unquote(b) + if err != nil { + return nil, fmt.Errorf("Unquote: %v", err) + } } curFile = &DiffFile{ |