diff options
| author | Peter Williams <peterw@src.gnome.org> | 2000-07-01 00:37:55 +0800 |
|---|---|---|
| committer | Peter Williams <peterw@src.gnome.org> | 2000-07-01 00:37:55 +0800 |
| commit | ac6baa408e751313bdba2672d522b0ae7f38477d (patch) | |
| tree | f47759dc0e8c9970d88b6f2a1eb44928d68e1131 /filter/filter-editor.c | |
| parent | 767f92d2b8ed11176f0eb83e239c443c5536ee81 (diff) | |
| download | gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar.gz gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar.bz2 gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar.lz gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar.xz gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.tar.zst gsoc2013-evolution-ac6baa408e751313bdba2672d522b0ae7f38477d.zip | |
Add some checks for bad/nonexistant XML docs.
svn path=/trunk/; revision=3828
Diffstat (limited to 'filter/filter-editor.c')
| -rw-r--r-- | filter/filter-editor.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/filter/filter-editor.c b/filter/filter-editor.c index bd039db21b..61ec13732c 100644 --- a/filter/filter-editor.c +++ b/filter/filter-editor.c @@ -370,8 +370,15 @@ filter_editor_set_rule_files(FilterEditor *e, const char *systemrules, const cha xmlDocPtr doc, out, optionset, filteroptions; doc = xmlParseFile(systemrules); - rules = filter_load_ruleset(doc); - options2 = filter_load_optionset(doc, rules); + if( doc == NULL ) { + g_warning( "Couldn't load system rules file %s", systemrules ); + rules = NULL; + options2 = NULL; + } else { + rules = filter_load_ruleset(doc); + options2 = filter_load_optionset(doc, rules); + } + out = xmlParseFile(userrules); if (out) options = filter_load_optionset(out, rules); |