opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

credentials/alts: Panic Bug Fix (#2800)

Browse Source
This commit is contained in:
Cesar Ghali
2019-05-03 10:47:23 -07:00
committed by GitHub
parent 028242f874
commit 4b60e3b6a1
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
credentials/alts/alts.go
View File

@ -197,14 +197,14 @@ func (g *altsTC) ClientHandshake(ctx context.Context, addr string, rawConn net.C
MinRpcVersion: minRPCVersion, MinRpcVersion: minRPCVersion,
} }
chs, err := handshaker.NewClientHandshaker(ctx, hsConn, rawConn, opts) chs, err := handshaker.NewClientHandshaker(ctx, hsConn, rawConn, opts)
if err != nil {
return nil, nil, err
}
defer func() { defer func() {
if err != nil { if err != nil {
chs.Close() chs.Close()
} }
}() }()
if err != nil {
return nil, nil, err
}
secConn, authInfo, err := chs.ClientHandshake(ctx) secConn, authInfo, err := chs.ClientHandshake(ctx)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err
@ -240,14 +240,14 @@ func (g *altsTC) ServerHandshake(rawConn net.Conn) (_ net.Conn, _ credentials.Au
MinRpcVersion: minRPCVersion, MinRpcVersion: minRPCVersion,
} }
shs, err := handshaker.NewServerHandshaker(ctx, hsConn, rawConn, opts) shs, err := handshaker.NewServerHandshaker(ctx, hsConn, rawConn, opts)
if err != nil {
return nil, nil, err
}
defer func() { defer func() {
if err != nil { if err != nil {
shs.Close() shs.Close()
} }
}() }()
if err != nil {
return nil, nil, err
}
secConn, authInfo, err := shs.ServerHandshake(ctx) secConn, authInfo, err := shs.ServerHandshake(ctx)
if err != nil { if err != nil {
return nil, nil, err return nil, nil, err