Fix memory leak : unexpected loop

thomas-kl1 · web-flow · commit 5eb94c30e6d6 · 2024-05-13T21:19:37.000+02:00
diff --git a/Plugin/App/Request/StorePathInfoValidator.php b/Plugin/App/Request/StorePathInfoValidator.php
@@ -34,9 +34,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string
             if ($uri !== false) {
                 if ($pathInfo === '') {
                     $pathInfo = parse_url($uri, PHP_URL_PATH);
-                    if ($pathInfo !== false) {
-                        $pathInfo = strtok($pathInfo, '/');
+                    if ($pathInfo === false) {
+                        return [$request, $pathInfo];
                     }
+                    $pathInfo = strtok($pathInfo, '/');
                 }
                 $pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri);
             }

Original file line number	Diff line number	Diff line change
`@@ -34,9 +34,10 @@ public function beforeGetValidStoreCode(Subject $subject, Http $request, string`
`34`	`34`	`if ($uri !== false) {`
`35`	`35`	`if ($pathInfo === '') {`
`36`	`36`	`$pathInfo = parse_url($uri, PHP_URL_PATH);`
`37`		`- if ($pathInfo !== false) {`
`38`		`- $pathInfo = strtok($pathInfo, '/');`
	`37`	`+ if ($pathInfo === false) {`
	`38`	`+ return [$request, $pathInfo];`
`39`	`39`	`}`
	`40`	`+ $pathInfo = strtok($pathInfo, '/');`
`40`	`41`	`}`
`41`	`42`	`$pathInfo = $pathInfo === false ? $this->resolveByWebUrl($uri) : $this->resolveByLinkUrl($uri);`
`42`	`43`	`}`