Page autocomplete: catch invalid regex

Author: annda

_test/types/PageTest.php

@@ -205,7 +205,7 @@ public function test_ajax_default()
                 'autocomplete' => [
                     'mininput' => 2,
                     'maxresult' => 5,
-                    'namespace' => '',
+                    'filter' => '',
                     'postfix' => '',
                 ],
             ]
@@ -238,6 +238,10 @@ public function test_ajax_default()
         ], $page->handleAjax());
     }
 
+    /**
+     * Test deprecated option namespace
+     * @return void
+     */
     public function test_ajax_namespace()
     {
         global $INPUT;
@@ -257,7 +261,7 @@ public function test_ajax_namespace()
         $this->assertEquals([['label' => 'syntax (wiki)', 'value' => 'wiki:syntax']], $page->handleAjax());
     }
 
-    public function test_ajax_namespace_multiple()
+    public function test_ajax_filter_multiple()
     {
         global $INPUT;
 
@@ -266,7 +270,7 @@ public function test_ajax_namespace_multiple()
                 'autocomplete' => [
                     'mininput' => 2,
                     'maxresult' => 5,
-                    'namespace' => '(wiki|foo)',
+                    'filter' => '(wiki|foo)',
                     'postfix' => '',
                 ],
             ]
@@ -279,6 +283,10 @@ public function test_ajax_namespace_multiple()
         ], $page->handleAjax());
     }
 
+    /**
+     * Test deprecated option postfix
+     * @return void
+     */
     public function test_ajax_postfix()
     {
         global $INPUT;

types/Page.php

@@ -5,6 +5,7 @@
 use dokuwiki\File\PageResolver;
 use dokuwiki\plugin\struct\meta\QueryBuilder;
 use dokuwiki\plugin\struct\meta\QueryBuilderWhere;
+use dokuwiki\plugin\struct\meta\StructException;
 use dokuwiki\Utf8\PhpString;
 
 /**
@@ -256,7 +257,12 @@ public function filterMatch($id, $filter)
             $filter = '^' . $filter;
         }
 
-        return (bool)preg_match('/' . $filter . '/', ':' . $id, $matches);
+        try {
+            $check = preg_match('/' . $filter . '/', ':' . $id, $matches);
+        } catch (\Exception $e) {
+            throw new StructException("Error processing regular expression '$filter'");
+        }
+        return (bool)$check;
     }
 
     /**