Changeset 1d12db24 for functions.c

Timestamp:

Dec 6, 2008, 12:04:44 AM (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:

3645317

Parents:

9375f8c

Message:

Zephyr: Escape interpolated variables in regexes using owl_text_quote().

File:

• functions.c (modified) (6 diffs)

functions.c

@@ -2615 +2615 @@
 {
   owl_filter *f;
-  char *argbuff, *longuser, *shortuser, *filtname;
+  char *argbuff, *longuser, *esclonguser, *shortuser, *filtname;
 
   /* stick the local realm on if it's not there */
@@ -2632 +2632 @@
   f=owl_malloc(sizeof(owl_filter));
 
+  esclonguser = owl_text_quote(longuser, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+
   argbuff=owl_sprintf("( type ^zephyr$ and filter personal and "
       "( ( direction ^in$ and sender ^%1$s$ ) or ( direction ^out$ and "
       "recipient ^%1$s$ ) ) ) or ( ( class ^login$ ) and ( sender ^%1$s$ ) )",
-      longuser);
+      esclonguser);
 
   owl_filter_init_fromstring(f, filtname, argbuff);
@@ -2645 +2647 @@
   owl_free(argbuff);
   owl_free(longuser);
+  owl_free(esclonguser);
   owl_free(shortuser);
 
@@ -2695 +2698 @@
 {
   owl_filter *f;
-  char *argbuff, *filtname;
+  char *argbuff, *filtname, *esctype;
 
   /* name for the filter */
@@ -2708 +2711 @@
   f=owl_malloc(sizeof(owl_filter));
 
-  argbuff = owl_sprintf("type ^%s$", type);
+  esctype = owl_text_quote(type, OWL_REGEX_QUOTECHARS, OWL_REGEX_QUOTEWITH);
+
+  argbuff = owl_sprintf("type ^%s$", esctype);
 
   owl_filter_init_fromstring(f, filtname, argbuff);
@@ -2717 +2722 @@
   /* free stuff */
   owl_free(argbuff);
+  owl_free(esctype);
 
   return filtname;