fix(context): panic on NegotiateFormat - index out of range (#3397)
This commit is contained in:
parent
3010cbd7f4
commit
7cb151bb4c
@ -1147,7 +1147,7 @@ func (c *Context) NegotiateFormat(offered ...string) string {
|
|||||||
// According to RFC 2616 and RFC 2396, non-ASCII characters are not allowed in headers,
|
// According to RFC 2616 and RFC 2396, non-ASCII characters are not allowed in headers,
|
||||||
// therefore we can just iterate over the string without casting it into []rune
|
// therefore we can just iterate over the string without casting it into []rune
|
||||||
i := 0
|
i := 0
|
||||||
for ; i < len(accepted); i++ {
|
for ; i < len(accepted) && i < len(offer); i++ {
|
||||||
if accepted[i] == '*' || offer[i] == '*' {
|
if accepted[i] == '*' || offer[i] == '*' {
|
||||||
return offer
|
return offer
|
||||||
}
|
}
|
||||||
|
@ -1311,6 +1311,14 @@ func TestContextNegotiationFormatCustom(t *testing.T) {
|
|||||||
assert.Equal(t, MIMEJSON, c.NegotiateFormat(MIMEJSON))
|
assert.Equal(t, MIMEJSON, c.NegotiateFormat(MIMEJSON))
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestContextNegotiationFormat2(t *testing.T) {
|
||||||
|
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||||
|
c.Request, _ = http.NewRequest("POST", "/", nil)
|
||||||
|
c.Request.Header.Add("Accept", "image/tiff-fx")
|
||||||
|
|
||||||
|
assert.Equal(t, "", c.NegotiateFormat("image/tiff"))
|
||||||
|
}
|
||||||
|
|
||||||
func TestContextIsAborted(t *testing.T) {
|
func TestContextIsAborted(t *testing.T) {
|
||||||
c, _ := CreateTestContext(httptest.NewRecorder())
|
c, _ := CreateTestContext(httptest.NewRecorder())
|
||||||
assert.False(t, c.IsAborted())
|
assert.False(t, c.IsAborted())
|
||||||
|
Loading…
Reference in New Issue
Block a user