Changeset e6a4dd5

Timestamp:

Apr 2, 2009, 1:23:14 AM (15 years ago)

Author:

Nelson Elhage <nelhage@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:

3071c69

Parents:

d9bfc82

Message:

Propagate regex compile failures out of filter creation.

Make calls to owl_filter_init_fromstring fail if the filter includes an
illegal regex (e.g. an initial *), by having owl_filterelement_create_re
return an error code which propagates up.

This fixes an issue where a command like 'unpunt class *' would segfault
because it succeeds in creating the invalid filter, but then fails to
print it successfully.

fixes: #70

Files:

• filter.c (modified) (1 diff)
• filterelement.c (modified) (1 diff)

filter.c

@@ -95 +95 @@
       owl_filterelement_create_perl(fe, *(argv+1));
     } else {
-      owl_filterelement_create_re(fe, *argv, *(argv+1));
+      if(owl_filterelement_create_re(fe, *argv, *(argv+1))) {
+        goto err;
+      }
     }
     i += 2;

filterelement.c

@@ -213 +213 @@
 }
 
-void owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
+int owl_filterelement_create_re(owl_filterelement *fe, char *field, char *re)
 {
   owl_filterelement_create(fe);
   fe->field=owl_strdup(field);
-  owl_regex_create(&(fe->re), re);
+  if(owl_regex_create(&(fe->re), re)) {
+    free(fe->field);
+    fe->field = NULL;
+    return (-1);
+  }
   fe->match_message = owl_filterelement_match_re;
   fe->print_elt = owl_filterelement_print_re;
+  return 0;
 }