]> Cypherpunks repositories - gostls13.git/commit
database/sql: fix nil pointer use within withLock
authorDaniel Theophanes <kardianos@gmail.com>
Thu, 21 Dec 2017 17:31:39 +0000 (09:31 -0800)
committerBrad Fitzpatrick <bradfitz@golang.org>
Wed, 3 Jan 2018 18:18:40 +0000 (18:18 +0000)
commit78583a125ae028b4c4ffc2732dfd1cd98855917c
tree0f242414cbb06f589bc7a88e2f416467729001da
parent15bc0a129ac149ac5130cb06d6bfdbbcc7e24d3c
database/sql: fix nil pointer use within withLock

During the refactor in 1126d1483f0397648905fcd4590ae45352cabd69 I
introduced a logical error within one withLock function that used
the result of the call before checking for the error. Change
the order so that the error is checked before the result is used.

None of the other withLock uses have similar issues.

Fixes #23208

Change-Id: I6c5dcf262e36bad4369c850f1e0131066360a82e
Reviewed-on: https://go-review.googlesource.com/85175
Run-TryBot: Daniel Theophanes <kardianos@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Caleb Spare <cespare@gmail.com>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
src/database/sql/sql.go