nilaway: ipn/proxies, ipn/warp

celzero · Jan 23, 2025 · cbc4a85 · cbc4a85
1 parent e86a307
commit cbc4a85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/intra/ipn/proxies.go b/intra/ipn/proxies.go
@@ -932,7 +932,7 @@ func (px *proxifier) registerAmnezia(existingStateJson []byte) (stateJson []byte
 	}
 
 	if id == nil {
-		err = errNilAmzId
+		return nil, errNilAmzId
 	}
 
 	if err != nil {
@@ -979,7 +979,7 @@ func (px *proxifier) RegisterProton(existingStateJson []byte) (stateJson []byte,
 		p, err = px.extc.MakeProtonWg(nostore)
 	}
 	if p == nil {
-		err = errNilProtonCfg
+		return nil, errNilProtonCfg
 	}
 	if err != nil {
 		log.E("proxy: proton: make (restore? %t) failed: %v", restore, err)

diff --git a/intra/ipn/warp/proton.go b/intra/ipn/warp/proton.go
@@ -1145,7 +1145,8 @@ func (a *ProtonClient) rereg(force bool) error {
 	}
 
 	now := time.Now().Unix()
-	fresh := a.config.CertRefreshTime-now > 0
+	// redundant nilcheck for nilaway
+	fresh := a.config != nil && a.config.CertRefreshTime-now > 0
 
 	log.I("proton: re-reg %s (exp? %t, force? %t)",
 		a.cert.SerialNumber, !fresh, force)