invoking client-streaming RPC can panic (#262)

This commit is contained in:
Joshua Humphries 2021-10-07 14:55:12 -04:00 committed by GitHub
parent b9d2d8cfa8
commit 76bbedeed0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 6 deletions

View File

@ -227,15 +227,19 @@ func invokeClientStream(ctx context.Context, stub grpcdynamic.Stub, md *desc.Met
return fmt.Errorf("grpc call for %q failed: %v", md.GetFullyQualifiedName(), err) return fmt.Errorf("grpc call for %q failed: %v", md.GetFullyQualifiedName(), err)
} }
if respHeaders, err := str.Header(); err == nil { if str != nil {
handler.OnReceiveHeaders(respHeaders) if respHeaders, err := str.Header(); err == nil {
handler.OnReceiveHeaders(respHeaders)
}
} }
if stat.Code() == codes.OK { if stat.Code() == codes.OK {
handler.OnReceiveResponse(resp) handler.OnReceiveResponse(resp)
} }
handler.OnReceiveTrailers(stat, str.Trailer()) if str != nil {
handler.OnReceiveTrailers(stat, str.Trailer())
}
return nil return nil
} }
@ -334,8 +338,10 @@ func invokeBidi(ctx context.Context, stub grpcdynamic.Stub, md *desc.MethodDescr
}() }()
} }
if respHeaders, err := str.Header(); err == nil { if str != nil {
handler.OnReceiveHeaders(respHeaders) if respHeaders, err := str.Header(); err == nil {
handler.OnReceiveHeaders(respHeaders)
}
} }
// Download each response message // Download each response message
@ -362,7 +368,9 @@ func invokeBidi(ctx context.Context, stub grpcdynamic.Stub, md *desc.MethodDescr
return fmt.Errorf("grpc call for %q failed: %v", md.GetFullyQualifiedName(), err) return fmt.Errorf("grpc call for %q failed: %v", md.GetFullyQualifiedName(), err)
} }
handler.OnReceiveTrailers(stat, str.Trailer()) if str != nil {
handler.OnReceiveTrailers(stat, str.Trailer())
}
return nil return nil
} }