From 47223f8214c092ff5ac3b1ce3997bc33842c6d6b Mon Sep 17 00:00:00 2001
From: rudolfkoenig <>
Date: Wed, 28 Oct 2015 07:22:39 +0000
Subject: [PATCH] console.js/FHEMWEB.pm: check for bad filter (Forum #43111)

git-svn-id: https://svn.fhem.de/fhem/trunk@9703 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/FHEM/01_FHEMWEB.pm  | 2 +-
 fhem/www/pgm2/console.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fhem/FHEM/01_FHEMWEB.pm b/fhem/FHEM/01_FHEMWEB.pm
index fe38de500..d4e09927e 100755
--- a/fhem/FHEM/01_FHEMWEB.pm
+++ b/fhem/FHEM/01_FHEMWEB.pm
@@ -2466,7 +2466,7 @@ FW_Notify($$)
       my $dt = $dev->{TYPE};
       for(my $i = 0; $i < $max; $i++) {
         my $line = ("$tn $dt $dn ".$events->[$i]."<br>");
-        push @data,$line if($line =~ m/$h->{filter}/);
+        eval { push @data,$line if($line =~ m/$h->{filter}/) }
       }
     }
   }
diff --git a/fhem/www/pgm2/console.js b/fhem/www/pgm2/console.js
index 4bb18c082..cedb09103 100644
--- a/fhem/www/pgm2/console.js
+++ b/fhem/www/pgm2/console.js
@@ -84,6 +84,11 @@ consStart()
         { text:"Cancel", click:function(){ $(this).dialog('close'); }},
         { text:"OK", click:function(){
           var val = $("#filtertext").val().trim();
+          try { 
+            new RegExp(val ? val : ".*");
+          } catch(e) {
+            return FW_okDialog(e);
+          }
           consFilter = val ? val : ".*";
           $(this).dialog('close');
           $("a#eventFilter").html(consFilter);