fix data race

sijms · May 4, 2024 · f485f79 · f485f79
1 parent 032d50b
commit f485f79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/v2/db_version.go b/v2/db_version.go
@@ -35,6 +35,9 @@ func GetDBVersion(session *network.Session) (*DBVersion, error) {
 		return nil, err
 	}
 	msg, err := session.GetByte()
+	if err != nil {
+		return nil, err
+	}
 	if msg != 8 {
 		return nil, errors.New(fmt.Sprintf("message code error: received code %d and expected code is 8", msg))
 	}

diff --git a/v2/network/session.go b/v2/network/session.go
@@ -196,6 +196,7 @@ func (session *Session) StartContext(ctx context.Context) {
 	go func(idone chan struct{}, mu *sync.Mutex) {
 		var err error
 		mu.Lock()
+		var tracer = session.tracer
 		mu.Unlock()
 		select {
 		case <-idone:
@@ -206,12 +207,12 @@ func (session *Session) StartContext(ctx context.Context) {
 			session.mu.Unlock()
 			if connected {
 				if err = session.BreakConnection(); err != nil {
-					session.tracer.Print("Connection Break Error: ", err)
+					tracer.Print("Connection Break Error: ", err)
 				}
 			} else {
 				err = session.WriteFinalPacket()
 				if err != nil {
-					session.tracer.Print("Write Final Packet With Error: ", err)
+					tracer.Print("Write Final Packet With Error: ", err)
 				}
 				session.Disconnect()
 			}
@@ -930,8 +931,8 @@ func (session *Session) GetError() *OracleError {
 }
 
 func (session *Session) readAll(size int) error {
-	session.mu.Lock()
-	defer session.mu.Unlock()
+	//session.mu.Lock()
+	//defer session.mu.Unlock()
 	index := 0
 	tempBuffer := make([]byte, size)
 	var err error