Merge pull request #6222 from dotani1111/dev/fix_invalid_page_error

fix:validate page number
EC-CUBE · Aug 7, 2024 · d56d630 · d56d630
2 parents f73f52c + 55bea2b
commit d56d630
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Eccube/Controller/ProductController.php b/src/Eccube/Controller/ProductController.php
@@ -164,7 +164,7 @@ public function index(Request $request, PaginatorInterface $paginator)
         /** @var SlidingPagination $pagination */
         $pagination = $paginator->paginate(
             $query,
-            !empty($searchData['pageno']) ? $searchData['pageno'] : 1,
+            !empty($searchData['pageno']) && preg_match('/^\d+$/', $searchData['pageno']) ? $searchData['pageno'] : 1,
             !empty($searchData['disp_number']) ? $searchData['disp_number']->getId() : $this->productListMaxRepository->findOneBy([], ['sort_no' => 'ASC'])->getId()
         );
 

diff --git a/src/Eccube/Controller/SitemapController.php b/src/Eccube/Controller/SitemapController.php
@@ -148,7 +148,7 @@ public function product(Request $request, PaginatorInterface $paginator)
         /** @var SlidingPagination $pagination */
         $pagination = $paginator->paginate(
             $productQueryBuilder,
-            $request->get('page'),
+            $request->get('page') ? : 1,
             $this->eccubeConfig['eccube_sitemap_products_per_page']
         );
         $paginationData = $pagination->getPaginationData();