From: Daniel Theophanes <kardianos@gmail.com>
Date: Thu, 21 Dec 2017 17:31:39 +0000 (-0800)
Subject: database/sql: fix nil pointer use within withLock
X-Git-Tag: go1.10beta2~70
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=78583a125ae028b4c4ffc2732dfd1cd98855917c;p=gostls13.git

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>
---

diff --git a/src/database/sql/sql.go b/src/database/sql/sql.go
index 9f4fa14534..8f5588ed26 100644
--- a/src/database/sql/sql.go
+++ b/src/database/sql/sql.go
@@ -2055,14 +2055,14 @@ func (tx *Tx) StmtContext(ctx context.Context, stmt *Stmt) *Stmt {
 		stmt.mu.Unlock()
 
 		if si == nil {
+			var ds *driverStmt
 			withLock(dc, func() {
-				var ds *driverStmt
 				ds, err = stmt.prepareOnConnLocked(ctx, dc)
-				si = ds.si
 			})
 			if err != nil {
 				return &Stmt{stickyErr: err}
 			}
+			si = ds.si
 		}
 		parentStmt = stmt
 	}