Permalink
Browse files

database/sql: add missing unlock when context is expired

Missing the DB mutex unlock on an early return after checking
if the context has expired.

Fixes #17518

Change-Id: I247cafcef62623d813f534a941f3d5a3744f0738
Reviewed-on: https://go-review.googlesource.com/31494
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Run-TryBot: Brad Fitzpatrick <bradfitz@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
  • Loading branch information...
kardianos authored and bradfitz committed Oct 19, 2016
1 parent 9cefbe9 commit 692df217ca21b6df8e4dc65538fcc90733e8900e
Showing with 1 addition and 0 deletions.
  1. +1 −0 src/database/sql/sql.go
View
@@ -814,6 +814,7 @@ func (db *DB) conn(ctx context.Context, strategy connReuseStrategy) (*driverConn
}
// Check if the context is expired.
if err := ctx.Err(); err != nil {
+ db.mu.Unlock()
return nil, err
}
lifetime := db.maxLifetime

0 comments on commit 692df21

Please sign in to comment.