Merge pull request #7433 from magento-cia/2.4.5-bugfixes-012822

dvoskoboinikov · web-flow · commit aabf11dad75c · 2022-02-01T12:00:33.000-06:00
Bugfixes
diff --git a/pub/errors/default/page.phtml b/pub/errors/default/page.phtml
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+
+// phpcs:ignoreFile
 ?>
 <!doctype html>
 <html xmlns="http://www.w3.org/1999/xhtml" >
 <head>
     <title><?= $this->pageTitle ?></title>
-    <base href="<?= $this->getViewFileUrl() ?>" />
+    <base href="<?= $this->escaper->escapeHtmlAttr($this->getViewFileUrl()) ?>" />
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
     <meta name="robots" content="*"/>
     <link rel="stylesheet" href="css/styles.css" type="text/css" />
diff --git a/pub/errors/processor.php b/pub/errors/processor.php
@@ -595,7 +595,7 @@ private function redirectToBaseUrl()
      */
     private function isReportIdValid(string $reportId): bool
     {
-        return (bool)preg_match('/[a-fA-F0-9]{64}/', $reportId);
+        return (bool)preg_match('/^[a-fA-F0-9]{64}$/', $reportId);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -595,7 +595,7 @@ private function redirectToBaseUrl()`
`595`	`595`	`*/`
`596`	`596`	`private function isReportIdValid(string $reportId): bool`
`597`	`597`	`{`
`598`		`- return (bool)preg_match('/[a-fA-F0-9]{64}/', $reportId);`
	`598`	`+ return (bool)preg_match('/^[a-fA-F0-9]{64}$/', $reportId);`
`599`	`599`	`}`
`600`	`600`
`601`	`601`	`/**`