Changeset 7013eb9 for commands.c

Timestamp:

Jan 5, 2011, 1:35:52 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

release-1.7

Children:

4976e93

Parents:

2e5b2f9

git-author:

David Benjamin <davidben@mit.edu> (01/02/11 19:37:28)

git-committer:

David Benjamin <davidben@mit.edu> (01/05/11 13:35:52)

Message:

If a smartfilter fails to parse, handle the error

Otherwise we segfault. Of course, we should always succeed in creating a
filter, but we sometimes don't because of quoting bugs.

File:

• commands.c (modified) (4 diffs)

commands.c

@@ -2291 +2291 @@
   }
   filtname = owl_function_classinstfilt(argv[1], NULL, owl_global_is_narrow_related(&g));
-  owl_function_change_currentview_filter(filtname);
-  owl_free(filtname);
+  if (filtname) {
+    owl_function_change_currentview_filter(filtname);
+    owl_free(filtname);
+  }
   return NULL;
 }
@@ -2304 +2306 @@
   }
   filtname=owl_function_zuserfilt(argv[1]);
-  owl_function_change_currentview_filter(filtname);
-  owl_free(filtname);
+  if (filtname) {
+    owl_function_change_currentview_filter(filtname);
+    owl_free(filtname);
+  }
   return NULL;
 }
@@ -2395 +2399 @@
 char *owl_command_colorclass(int argc, const char *const *argv, const char *buff)
 {
-  const char *filtname;
+  char *filtname;
   
   if (argc < 3 || argc > 4) {
@@ -2403 +2407 @@
 
   filtname=owl_function_classinstfilt(argv[1], NULL, owl_global_is_narrow_related(&g));
-  (void) owl_function_color_filter(filtname, argv[2], (argc == 4 ? argv[3] : NULL));
+  if (filtname) {
+    (void) owl_function_color_filter(filtname, argv[2], (argc == 4 ? argv[3] : NULL));
+    owl_free(filtname);
+  }
   return NULL;
 }