Changeset f79d6a2

Timestamp:

Dec 5, 2008, 11:21:35 PM (16 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, debian, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

9375f8c

Parents:

2209f16

Message:

IRC: Escape interpolated variables in regexes using "\Q\E".

File:

• perl/modules/IRC/lib/BarnOwl/Message/IRC.pm (modified) (2 diffs)

perl/modules/IRC/lib/BarnOwl/Message/IRC.pm

@@ -33 +33 @@
         @filter  =
              (qw{( type ^irc$ and filter personal and },
-              qw{( ( direction ^in$ and sender}, "^$who\$",
-              qw{ ) or ( direction ^out$ and recipient}, "^$who\$",
+              qw{( ( direction ^in$ and sender}, "^\Q$who\E\$",
+              qw{ ) or ( direction ^out$ and recipient}, "^\Q$who\E\$",
               qw{) ) ) });
         BarnOwl::command("filter", "$filter", @filter);
@@ -47 +47 @@
             $filter = "irc-$network-channel-$channel-$sender-$1";
             @filter =
-                 (qw{type ^irc$ and network}, "^$network\$",
-                  qw{and channel}, "^$channel\$",
-                  qw{and ( sender}, "^$sender\$",
-                  qw{or sender}, "^$1\$",qq{)});
+                 (qw{type ^irc$ and network}, "^\Q$network\E\$",
+                  qw{and channel}, "^\Q$channel\E\$",
+                  qw{and ( sender}, "^\Q$sender\E\$",
+                  qw{or sender}, "^\Q$1\E\$",qq{)});
         } else {
             $filter = "irc-$network-channel-$channel";
-            @filter = (qw{type ^irc$ and network}, "^$network\$",
-                       qw{and channel}, "^$channel\$");
+            @filter = (qw{type ^irc$ and network}, "^\Q$network\E\$",
+                       qw{and channel}, "^\Q$channel\E\$");
         }
         BarnOwl::command("filter", "$filter", @filter);