fix problems with empty/corrupt filters

[spider.git] / perl / Filter.pm

diff --git a/perl/Filter.pm b/perl/Filter.pm
index a2f5ce46a7bac5f070e8531eaef59389e0f28b07..3009883b66f3a967665b46cc09e4b8310f5ff354 100644 (file)
--- a/perl/Filter.pm
+++ b/perl/Filter.pm
@@ -116,17 +116,25 @@ sub read_in
                $in = undef; 
                my $s = readfilestr($fn);
                my $newin = eval $s;
-               dbg($@) if $@;
+               if ($@) {
+                       dbg($@);
+                       unlink($fn);
+                       return undef;
+               }
                if ($in) {
                        $newin = new('Filter::Old', $sort, $call, $flag);
                        $newin->{filter} = $in;
-               } else {
+               } elsif (ref $newin && $newin->can('getfilkeys')) {
                        my $filter;
                        my $key;
                        foreach $key ($newin->getfilkeys) {
                                $newin->compile($key, 'reject');
                                $newin->compile($key, 'accept');
                        }
+               } else {
+                       # error on reading file, delete and exit
+                       unlink($fn);
+                       return undef;
                }
                return $newin;
        }