diff options
| author | Yawning Angel <yawning@torproject.org> | 2016-01-25 12:16:15 +0000 |
|---|---|---|
| committer | Yawning Angel <yawning@torproject.org> | 2016-01-25 12:16:15 +0000 |
| commit | 2cbefcfcd23d457cff742e4941cb705604d53ce5 (patch) | |
| tree | d86f36e5cc709912ce37943d731be4b6f4669551 /transports | |
| parent | c0e8866c13f051c4eea0c1d940b8592cd7c8075c (diff) | |
Fix other instances of attempting to close `nil` on handshake failure.
Bug introduced in e52258edac55d82ff153755493d770bfbbc9a346, not in any
released version of obfs4proxy.
Diffstat (limited to 'transports')
| -rw-r--r-- | transports/obfs2/obfs2.go | 3 | ||||
| -rw-r--r-- | transports/obfs3/obfs3.go | 3 | ||||
| -rw-r--r-- | transports/scramblesuit/base.go | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/transports/obfs2/obfs2.go b/transports/obfs2/obfs2.go index a926141..8fa6cb8 100644 --- a/transports/obfs2/obfs2.go +++ b/transports/obfs2/obfs2.go @@ -113,8 +113,9 @@ func (cf *obfs2ClientFactory) Dial(network, addr string, dialFn base.DialFunc, a if err != nil { return nil, err } + dialConn := conn if conn, err = newObfs2ClientConn(conn); err != nil { - conn.Close() + dialConn.Close() return nil, err } return conn, nil diff --git a/transports/obfs3/obfs3.go b/transports/obfs3/obfs3.go index e4c3ba6..08d6be4 100644 --- a/transports/obfs3/obfs3.go +++ b/transports/obfs3/obfs3.go @@ -97,8 +97,9 @@ func (cf *obfs3ClientFactory) Dial(network, addr string, dialFn base.DialFunc, a if err != nil { return nil, err } + dialConn := conn if conn, err = newObfs3ClientConn(conn); err != nil { - conn.Close() + dialConn.Close() return nil, err } return conn, nil diff --git a/transports/scramblesuit/base.go b/transports/scramblesuit/base.go index 223d085..7a71398 100644 --- a/transports/scramblesuit/base.go +++ b/transports/scramblesuit/base.go @@ -87,8 +87,9 @@ func (cf *ssClientFactory) Dial(network, addr string, dialFn base.DialFunc, args if err != nil { return nil, err } + dialConn := conn if conn, err = newScrambleSuitClientConn(conn, cf.ticketStore, ca); err != nil { - conn.Close() + dialConn.Close() return nil, err } return conn, nil |