proxy: fix panic

AdguardTeam · Dec 2, 2022 · 881fbc0 · 881fbc0
1 parent 7aa32db
commit 881fbc0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/proxy/cache.go b/proxy/cache.go
@@ -318,15 +318,19 @@ func (c *cache) clearItems() {
 	c.itemsLock.Lock()
 	defer c.itemsLock.Unlock()
 
-	c.items.Clear()
+	if c.items != nil {
+		c.items.Clear()
+	}
 }
 
 // clearItemsWithSubnet empties the subnet cache.
 func (c *cache) clearItemsWithSubnet() {
 	c.itemsWithSubnetLock.Lock()
 	defer c.itemsWithSubnetLock.Unlock()
 
-	c.itemsWithSubnet.Clear()
+	if c.itemsWithSubnet != nil {
+		c.itemsWithSubnet.Clear()
+	}
 }
 
 // cacheTTL returns the number of seconds for which m is valid to be cached.

diff --git a/proxy/cache_test.go b/proxy/cache_test.go
@@ -146,8 +146,8 @@ func TestCache_expired(t *testing.T) {
 			key := msgToKey(reply)
 			data := (&cacheItem{
 				m:   reply,
-				ttl: tc.ttl,
 				u:   testUpsAddr,
+				ttl: tc.ttl,
 			}).pack()
 			testCache.items.Set(key, data)
 			t.Cleanup(testCache.items.Clear)