fix memory leak

a1812 · a1812 · commit 21d3d24caafb · 2021-11-10T23:39:56.000+03:00
diff --git a/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php b/src/Symfony/Component/Cache/Traits/AbstractAdapterTrait.php
@@ -365,7 +365,6 @@ private function generateItems(iterable $items, array &$keys): \Generator
     private function getId($key)
     {
         if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {
-            $this->ids = [];
             $this->namespaceVersion = '1'.static::NS_SEPARATOR;
             try {
                 foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {
@@ -379,18 +378,14 @@ private function getId($key)
             }
         }
 
-        if (\is_string($key) && isset($this->ids[$key])) {
-            return $this->namespace.$this->namespaceVersion.$this->ids[$key];
-        }
         \assert('' !== CacheItem::validateKey($key));
-        $this->ids[$key] = $key;
 
         if (null === $this->maxIdLength) {
             return $this->namespace.$this->namespaceVersion.$key;
         }
         if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {
             // Use MD5 to favor speed over security, which is not an issue here
-            $this->ids[$key] = $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
+            $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));
             $id = $this->namespace.$this->namespaceVersion.$id;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -365,7 +365,6 @@ private function generateItems(iterable $items, array &$keys): \Generator`
`365`	`365`	`private function getId($key)`
`366`	`366`	`{`
`367`	`367`	`if ($this->versioningIsEnabled && '' === $this->namespaceVersion) {`
`368`		`- $this->ids = [];`
`369`	`368`	`$this->namespaceVersion = '1'.static::NS_SEPARATOR;`
`370`	`369`	`try {`
`371`	`370`	`foreach ($this->doFetch([static::NS_SEPARATOR.$this->namespace]) as $v) {`
`@@ -379,18 +378,14 @@ private function getId($key)`
`379`	`378`	`}`
`380`	`379`	`}`
`381`	`380`
`382`		`- if (\is_string($key) && isset($this->ids[$key])) {`
`383`		`- return $this->namespace.$this->namespaceVersion.$this->ids[$key];`
`384`		`- }`
`385`	`381`	`\assert('' !== CacheItem::validateKey($key));`
`386`		`- $this->ids[$key] = $key;`
`387`	`382`
`388`	`383`	`if (null === $this->maxIdLength) {`
`389`	`384`	`return $this->namespace.$this->namespaceVersion.$key;`
`390`	`385`	`}`
`391`	`386`	`if (\strlen($id = $this->namespace.$this->namespaceVersion.$key) > $this->maxIdLength) {`
`392`	`387`	`// Use MD5 to favor speed over security, which is not an issue here`
`393`		`- $this->ids[$key] = $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));`
	`388`	`+ $id = substr_replace(base64_encode(hash('md5', $key, true)), static::NS_SEPARATOR, -(\strlen($this->namespaceVersion) + 2));`
`394`	`389`	`$id = $this->namespace.$this->namespaceVersion.$id;`
`395`	`390`	`}`
`396`	`391`