Browse Source

wiki: fix crash with blob name contains tab (#3916)

pull/3785/merge
Unknwon 8 years ago
parent
commit
3b49a99b60
No known key found for this signature in database
GPG Key ID: 25B575AE3213B2B3
  1. 6
      Makefile
  2. 2
      cmd/web.go
  3. 2
      vendor/github.com/gogits/git-module/README.md
  4. 2
      vendor/github.com/gogits/git-module/git.go
  5. 24
      vendor/github.com/gogits/git-module/tree.go
  6. 6
      vendor/vendor.json

6
Makefile

@ -70,11 +70,11 @@ test:
go test -cover -race ./... go test -cover -race ./...
fixme: fixme:
grep -rnw "FIXME" routers models modules grep -rnw "FIXME" cmd routers models modules
todo: todo:
grep -rnw "TODO" routers models modules grep -rnw "TODO" cmd routers models modules
# Legacy code should be remove by the time of release # Legacy code should be remove by the time of release
legacy: legacy:
grep -rnw "LEGACY" routers models modules grep -rnw "LEGACY" cmd routers models modules

2
cmd/web.go

@ -95,7 +95,7 @@ func checkVersion() {
{"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"}, {"github.com/go-macaron/toolbox", toolbox.Version, "0.1.0"},
{"gopkg.in/ini.v1", ini.Version, "1.8.4"}, {"gopkg.in/ini.v1", ini.Version, "1.8.4"},
{"gopkg.in/macaron.v1", macaron.Version, "1.1.7"}, {"gopkg.in/macaron.v1", macaron.Version, "1.1.7"},
{"github.com/gogits/git-module", git.Version, "0.4.8"}, {"github.com/gogits/git-module", git.Version, "0.4.9"},
{"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"}, {"github.com/gogits/go-gogs-client", gogs.Version, "0.12.1"},
} }
for _, c := range checkers { for _, c := range checkers {

2
vendor/github.com/gogits/git-module/README.md generated vendored

@ -4,7 +4,7 @@ Package git-module is a Go module for Git access through shell commands.
## Limitations ## Limitations
- Go version must be at least **1.3**. - Go version must be at least **1.4**.
- Git version must be no less than **1.7.1**, and greater than or equal to **1.8.0** is recommended. - Git version must be no less than **1.7.1**, and greater than or equal to **1.8.0** is recommended.
- For Windows users, try use as new a version as possible. - For Windows users, try use as new a version as possible.

2
vendor/github.com/gogits/git-module/git.go generated vendored

@ -10,7 +10,7 @@ import (
"time" "time"
) )
const _VERSION = "0.4.8" const _VERSION = "0.4.9"
func Version() string { func Version() string {
return _VERSION return _VERSION

24
vendor/github.com/gogits/git-module/tree.go generated vendored

@ -29,25 +29,23 @@ func NewTree(repo *Repository, id sha1) *Tree {
} }
} }
var escapeChar = []byte("\\") // Predefine []byte variables to avoid runtime allocations.
var (
escapedSlash = []byte(`\\`)
regularSlash = []byte(`\`)
escapedTab = []byte(`\t`)
regularTab = []byte("\t")
)
// UnescapeChars reverses escaped characters. // UnescapeChars reverses escaped characters.
func UnescapeChars(in []byte) []byte { func UnescapeChars(in []byte) []byte {
if bytes.Index(in, escapeChar) == -1 { // LEGACY [Go 1.7]: use more expressive bytes.ContainsAny
if bytes.IndexAny(in, "\\\t") == -1 {
return in return in
} }
endIdx := len(in) - 1 out := bytes.Replace(in, escapedSlash, regularSlash, -1)
isEscape := false out = bytes.Replace(out, escapedTab, regularTab, -1)
out := make([]byte, 0, endIdx+1)
for i := range in {
if in[i] == '\\' && !isEscape {
isEscape = true
continue
}
isEscape = false
out = append(out, in[i])
}
return out return out
} }

6
vendor/vendor.json vendored

@ -159,10 +159,10 @@
"revisionTime": "2016-08-10T03:50:02Z" "revisionTime": "2016-08-10T03:50:02Z"
}, },
{ {
"checksumSHA1": "PvpYCMEys67XcZPCZR27tRjnkHY=", "checksumSHA1": "RSr3IvGo5PFxAP3ybtDcEojTWPI=",
"path": "github.com/gogits/git-module", "path": "github.com/gogits/git-module",
"revision": "a6d3c3660265eece3a34aef4f6ec4ce29b543294", "revision": "41f3ca26f6b202c82d022a1062f7b7ea6339924b",
"revisionTime": "2017-02-15T23:32:44Z" "revisionTime": "2017-02-16T16:46:07Z"
}, },
{ {
"checksumSHA1": "xvG+RgJODQqlmdAkHUQK2TyLR88=", "checksumSHA1": "xvG+RgJODQqlmdAkHUQK2TyLR88=",

Loading…
Cancel
Save