mirror of
https://github.com/aler9/gortsplib
synced 2025-10-05 07:06:58 +08:00
server: fix crash in case of requests with nil URL (#458)
--------- Co-authored-by: aler9 <46489434+aler9@users.noreply.github.com>
This commit is contained in:
@@ -208,10 +208,15 @@ func (sc *ServerConn) handleRequestInner(req *base.Request) (*base.Response, err
|
|||||||
if cseq, ok := req.Header["CSeq"]; !ok || len(cseq) != 1 {
|
if cseq, ok := req.Header["CSeq"]; !ok || len(cseq) != 1 {
|
||||||
return &base.Response{
|
return &base.Response{
|
||||||
StatusCode: base.StatusBadRequest,
|
StatusCode: base.StatusBadRequest,
|
||||||
Header: base.Header{},
|
|
||||||
}, liberrors.ErrServerCSeqMissing{}
|
}, liberrors.ErrServerCSeqMissing{}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if req.Method != base.Options && req.URL == nil {
|
||||||
|
return &base.Response{
|
||||||
|
StatusCode: base.StatusBadRequest,
|
||||||
|
}, liberrors.ErrServerInvalidPath{}
|
||||||
|
}
|
||||||
|
|
||||||
sxID := getSessionID(req.Header)
|
sxID := getSessionID(req.Header)
|
||||||
|
|
||||||
var path string
|
var path string
|
||||||
|
@@ -311,7 +311,40 @@ func TestServerErrorCSeqMissing(t *testing.T) {
|
|||||||
res, err := writeReqReadRes(conn, base.Request{
|
res, err := writeReqReadRes(conn, base.Request{
|
||||||
Method: base.Options,
|
Method: base.Options,
|
||||||
URL: mustParseURL("rtsp://localhost:8554/"),
|
URL: mustParseURL("rtsp://localhost:8554/"),
|
||||||
Header: base.Header{},
|
})
|
||||||
|
require.NoError(t, err)
|
||||||
|
require.Equal(t, base.StatusBadRequest, res.StatusCode)
|
||||||
|
|
||||||
|
<-nconnClosed
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestServerErrorNilURL(t *testing.T) {
|
||||||
|
nconnClosed := make(chan struct{})
|
||||||
|
|
||||||
|
s := &Server{
|
||||||
|
Handler: &testServerHandler{
|
||||||
|
onConnClose: func(ctx *ServerHandlerOnConnCloseCtx) {
|
||||||
|
require.EqualError(t, ctx.Error, "invalid path")
|
||||||
|
close(nconnClosed)
|
||||||
|
},
|
||||||
|
},
|
||||||
|
RTSPAddress: "localhost:8554",
|
||||||
|
}
|
||||||
|
err := s.Start()
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer s.Close()
|
||||||
|
|
||||||
|
nconn, err := net.Dial("tcp", "localhost:8554")
|
||||||
|
require.NoError(t, err)
|
||||||
|
defer nconn.Close()
|
||||||
|
conn := conn.NewConn(nconn)
|
||||||
|
|
||||||
|
res, err := writeReqReadRes(conn, base.Request{
|
||||||
|
Method: base.Describe,
|
||||||
|
URL: nil,
|
||||||
|
Header: base.Header{
|
||||||
|
"CSeq": base.HeaderValue{"1"},
|
||||||
|
},
|
||||||
})
|
})
|
||||||
require.NoError(t, err)
|
require.NoError(t, err)
|
||||||
require.Equal(t, base.StatusBadRequest, res.StatusCode)
|
require.Equal(t, base.StatusBadRequest, res.StatusCode)
|
||||||
|
Reference in New Issue
Block a user