Update relay.go: fix theoretical TOCTOU (#995)

reshke · web-flow · commit e16395b0dd3c · 2025-02-03T15:52:25.000+05:00
* Update relay.go: fix theoretical TOCTOU

* fix
diff --git a/router/relay/relay.go b/router/relay/relay.go
@@ -175,18 +175,21 @@ func NewRelayState(qr qrouter.QueryRouter, client client.RouterClient, manager p
 }
 
 func (rst *RelayStateImpl) SyncCount() int64 {
-	if rst.Cl.Server() == nil {
+	server := rst.Client().Server()
+	if server == nil {
 		return 0
 	}
-	return rst.Cl.Server().Sync()
+	return server.Sync()
 }
 
 func (rst *RelayStateImpl) DataPending() bool {
-	if rst.Cl.Server() == nil {
+	server := rst.Client().Server()
+
+	if server == nil {
 		return false
 	}
 
-	return rst.Cl.Server().DataPending()
+	return server.DataPending()
 }
 
 func (rst *RelayStateImpl) QueryRouter() qrouter.QueryRouter {

Original file line number	Diff line number	Diff line change
`@@ -175,18 +175,21 @@ func NewRelayState(qr qrouter.QueryRouter, client client.RouterClient, manager p`
`175`	`175`	`}`
`176`	`176`
`177`	`177`	`func (rst *RelayStateImpl) SyncCount() int64 {`
`178`		`- if rst.Cl.Server() == nil {`
	`178`	`+ server := rst.Client().Server()`
	`179`	`+ if server == nil {`
`179`	`180`	`return 0`
`180`	`181`	`}`
`181`		`- return rst.Cl.Server().Sync()`
	`182`	`+ return server.Sync()`
`182`	`183`	`}`
`183`	`184`
`184`	`185`	`func (rst *RelayStateImpl) DataPending() bool {`
`185`		`- if rst.Cl.Server() == nil {`
	`186`	`+ server := rst.Client().Server()`
	`187`	`+`
	`188`	`+ if server == nil {`
`186`	`189`	`return false`
`187`	`190`	`}`
`188`	`191`
`189`		`- return rst.Cl.Server().DataPending()`
	`192`	`+ return server.DataPending()`
`190`	`193`	`}`
`191`	`194`
`192`	`195`	`func (rst *RelayStateImpl) QueryRouter() qrouter.QueryRouter {`