From dd910a1313983491deb995ed83ddfa69ea9a06d4 Mon Sep 17 00:00:00 2001
From: borisneubert <>
Date: Thu, 28 May 2015 17:55:18 +0000
Subject: [PATCH] 57_Calendar: catch deadly regular expressions in get

git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@8644 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 FHEM/57_Calendar.pm | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/FHEM/57_Calendar.pm b/FHEM/57_Calendar.pm
index 942528870..7863d586f 100644
--- a/FHEM/57_Calendar.pm
+++ b/FHEM/57_Calendar.pm
@@ -1076,9 +1076,13 @@ sub Calendar_Get($@) {
     return "argument is missing" if($#a != 2);
     my $regexp= $a[2];
     my @uids;
-    foreach my $event ($eventsObj->events()) {
-      push @uids, $event->uid() if($event->summary() =~ m/$regexp/);
-    }
+    eval {
+        foreach my $event ($eventsObj->events()) {
+            push @uids, $event->uid() if($event->summary() =~ m/$regexp/);
+        }
+    };
+    Log3($hash, 2, "Calendar " . $hash->{NAME} . 
+        ": The regular expression $regexp caused a problem: $@") if($@);
     return join(";", @uids);
   
   } else {