bug #34668 [Cache] Make sure we get the correct number of values from redis::mget() (thePanz)

nicolas-grekas · nicolas-grekas · commit f0a6de273667 · 2019-11-27T19:58:25.000+01:00
This PR was merged into the 3.4 branch. Discussion ---------- [Cache] Make sure we get the correct number of values from redis::mget() | Q | A | ------------- | --- | Branch? | 3.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | N/A | License | MIT | Doc PR | N/A Redis might not be reachable when invoking `redis->mget($ids)`, the call returns `false` instead of an array. This change makes sure the return value is properly check, including the correctness of the parameters to invoke `array_combine($ids, $cacheValues);`. From the documentation: > Returns the combined array, FALSE if the number of elements for each array isn't equal. Commits ------- 685c36c [Cache] Make sure we get the correct number of values from redis::mget()
diff --git a/src/Symfony/Component/Cache/Traits/RedisTrait.php b/src/Symfony/Component/Cache/Traits/RedisTrait.php
@@ -179,7 +179,13 @@ protected function doFetch(array $ids)
                 }
             });
         } else {
-            $values = array_combine($ids, $this->redis->mget($ids));
+            $values = $this->redis->mget($ids);
+
+            if (!\is_array($values) || \count($values) !== \count($ids)) {
+                return [];
+            }
+
+            $values = array_combine($ids, $values);
         }
 
         foreach ($values as $id => $v) {

Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,13 @@ protected function doFetch(array $ids)`
`179`	`179`	`}`
`180`	`180`	`});`
`181`	`181`	`} else {`
`182`		`- $values = array_combine($ids, $this->redis->mget($ids));`
	`182`	`+ $values = $this->redis->mget($ids);`
	`183`	`+`
	`184`	`+ if (!\is_array($values) \|\| \count($values) !== \count($ids)) {`
	`185`	`+ return [];`
	`186`	`+ }`
	`187`	`+`
	`188`	`+ $values = array_combine($ids, $values);`
`183`	`189`	`}`
`184`	`190`
`185`	`191`	`foreach ($values as $id => $v) {`