lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 17:46:58 -05:00
Code Issues Releases Wiki Activity

fix double release on buffers

Browse Source
This commit is contained in:
Darien Raymond 2018-03-28 22:23:24 +02:00
parent 12181f527f
commit fa63beceb6
No known key found for this signature in database
GPG Key ID: 7251FFA14BB18169
4 changed files with 26 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/proxyman/mux/mux.go
View File

@ -150,11 +150,6 @@ func fetchInput(ctx context.Context, s *Session, output buf.Writer) {
defer s.Close() defer s.Close()
newError("dispatching request to ", dest).WithContext(ctx).WriteToLog() newError("dispatching request to ", dest).WithContext(ctx).WriteToLog()
data, _ := s.input.ReadTimeout(time.Millisecond * 500)
if err := writer.WriteMultiBuffer(data); err != nil {
newError("failed to write first payload").Base(err).WithContext(ctx).WriteToLog()
return
}
if err := buf.Copy(s.input, writer); err != nil { if err := buf.Copy(s.input, writer); err != nil {
newError("failed to fetch all input").Base(err).WithContext(ctx).WriteToLog() newError("failed to fetch all input").Base(err).WithContext(ctx).WriteToLog()
} }

15
proxy/shadowsocks/server.go
View File

@ -178,14 +178,15 @@ func (s *Server) handleConnection(ctx context.Context, conn internet.Connection,
return newError("failed to write response").Base(err) return newError("failed to write response").Base(err)
} }
payload, err := ray.InboundOutput().ReadMultiBuffer() {
if err != nil { payload, err := ray.InboundOutput().ReadMultiBuffer()
return err if err != nil {
return err
}
if err := responseWriter.WriteMultiBuffer(payload); err != nil {
return err
}
} }
if err := responseWriter.WriteMultiBuffer(payload); err != nil {
return err
}
payload.Release()
if err := bufferedWriter.SetBuffered(false); err != nil { if err := bufferedWriter.SetBuffered(false); err != nil {
return err return err

17
proxy/vmess/inbound/inbound.go
View File

@ -182,16 +182,17 @@ func transferResponse(timer signal.ActivityUpdater, session *encoding.ServerSess
bodyWriter := session.EncodeResponseBody(request, output) bodyWriter := session.EncodeResponseBody(request, output)
// Optimize for small response packet {
data, err := input.ReadMultiBuffer() // Optimize for small response packet
if err != nil { data, err := input.ReadMultiBuffer()
return err if err != nil {
} return err
}
if err := bodyWriter.WriteMultiBuffer(data); err != nil { if err := bodyWriter.WriteMultiBuffer(data); err != nil {
return err return err
}
} }
data.Release()
if bufferedWriter, ok := output.(*buf.BufferedWriter); ok { if bufferedWriter, ok := output.(*buf.BufferedWriter); ok {
if err := bufferedWriter.SetBuffered(false); err != nil { if err := bufferedWriter.SetBuffered(false); err != nil {

17
proxy/vmess/outbound/outbound.go
View File

@ -113,15 +113,16 @@ func (v *Handler) Process(ctx context.Context, outboundRay ray.OutboundRay, dial
} }
bodyWriter := session.EncodeRequestBody(request, writer) bodyWriter := session.EncodeRequestBody(request, writer)
firstPayload, err := input.ReadTimeout(time.Millisecond * 500) {
if err != nil && err != buf.ErrReadTimeout { firstPayload, err := input.ReadTimeout(time.Millisecond * 500)
return newError("failed to get first payload").Base(err) if err != nil && err != buf.ErrReadTimeout {
} return newError("failed to get first payload").Base(err)
if !firstPayload.IsEmpty() { }
if err := bodyWriter.WriteMultiBuffer(firstPayload); err != nil { if !firstPayload.IsEmpty() {
return newError("failed to write first payload").Base(err) if err := bodyWriter.WriteMultiBuffer(firstPayload); err != nil {
return newError("failed to write first payload").Base(err)
}
} }
firstPayload.Release()
} }
if err := writer.SetBuffered(false); err != nil { if err := writer.SetBuffered(false); err != nil {