From fbfdefa3e02369282cf170341b5afd0ffc11d5b8 Mon Sep 17 00:00:00 2001 From: Nicolas Stepien Date: Tue, 13 Dec 2011 17:13:09 +0100 Subject: [PATCH] Prevent regexp errors with the filter. --- 4chan_x.user.js | 7 ++++++- changelog | 2 ++ script.coffee | 5 ++++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/4chan_x.user.js b/4chan_x.user.js index c6070a4f5..54fa135b6 100644 --- a/4chan_x.user.js +++ b/4chan_x.user.js @@ -537,7 +537,12 @@ for (_i = 0, _len = m.length; _i < _len; _i++) { filter = m[_i]; f = filter.match(/^\/(.+)\/(\w*)$/); - this.regexps[key].push(RegExp(f[1], f[2])); + try { + this.regexps[key].push(RegExp(f[1], f[2])); + } catch (e) { + alert(e.message); + alert(e); + } } this.callbacks.push(this[key]); } diff --git a/changelog b/changelog index f46ce8b9c..68fe864f7 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,6 @@ master +- mayhem + prevent regexp errors with the filter 2.32.3 - mayhem diff --git a/script.coffee b/script.coffee index ae31643ae..2c202ca55 100644 --- a/script.coffee +++ b/script.coffee @@ -401,7 +401,10 @@ filter = @regexps[key] = [] for filter in m f = filter.match /^\/(.+)\/(\w*)$/ - @regexps[key].push RegExp f[1], f[2] + try + @regexps[key].push RegExp f[1], f[2] + catch e + alert e.message #only execute what's filterable @callbacks.push @[key]