code review 88340043: crypto/tls: don't block on Read of zero bytes

crypto/tls: don't block on Read of zero bytes

Fixes Issue 7775

[bradfitz, 2014-04-16 02:25:06]

Hello agl@chromium.org (cc: golang-codereviews@googlegroups.com,
rsc@golang.org),

I'd like you to review this change to
https://go.googlecode.com/hg/

[bradfitz, 2014-04-16 02:26:12]

This was marked Go 1.3, but then I realized it was Minux marking it as such
2 days ago.

I can also just move that bug to Go 1.4 too.



On Tue, Apr 15, 2014 at 7:25 PM, <bradfitz@golang.org> wrote:

> Reviewers: agl,
>
> Message:
> Hello agl@chromium.org (cc: golang-codereviews@googlegroups.com,
> rsc@golang.org),
>
> I'd like you to review this change to
> https://go.googlecode.com/hg/
>
>
> Description:
> crypto/tls: don't block on Read of zero bytes
>
> Fixes Issue 7775
>
> Please review this at https://codereview.appspot.com/88340043/
>
> Affected files (+5, -0 lines):
>   M src/pkg/crypto/tls/conn.go
>
>
> Index: src/pkg/crypto/tls/conn.go
> ===================================================================
> --- a/src/pkg/crypto/tls/conn.go
> +++ b/src/pkg/crypto/tls/conn.go
> @@ -884,6 +884,11 @@
>         if err = c.Handshake(); err != nil {
>                 return
>         }
> +       if len(b) == 0 {
> +               // Put this after Handshake, in case people were calling
> Read(nil) for
> +               // the side effect of the Handshake.
> +               return
> +       }
>
>         c.in.Lock()
>         defer c.in.Unlock()
>
>
>

[rsc, 2014-04-16 02:36:11]

LGTM

[bradfitz, 2014-04-16 02:40:06]

*** Submitted as https://code.google.com/p/go/source/detail?r=546d3f574b84 ***

crypto/tls: don't block on Read of zero bytes

Fixes Issue 7775

LGTM=rsc
R=agl, rsc
CC=golang-codereviews
https://codereview.appspot.com/88340043