From 183d2c48eb52c3ee9079b6d40f538e8f860cba19 Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Fri, 1 Jan 2021 18:10:12 +0000 Subject: [PATCH] fhemweb.js: avoid crash in regexp check (Forum #117259) git-svn-id: https://svn.fhem.de/fhem/trunk@23453 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb.js | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index d20c19c66..e83ed1afb 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -1289,13 +1289,17 @@ FW_detailSelect(selEl, mayMissing) if(selVal != null && selVal != undefined) { for(var i1=0; i1 2) { - var re = aap.shift(); - aap = [re, aap.join(":")]; + try { + if(selVal.match(new RegExp("^"+aap[0]+"$"))) { + if(aap.length > 2) { + var re = aap.shift(); + aap = [re, aap.join(":")]; + } + argAndPar = aap; + fnd = true; } - argAndPar = aap; - fnd = true; + } catch(e){ + log("Problem building regexp from "+listArr[i1]); } } }