Blob Blame History Raw
diff -urN privoxy-3.0.6-stable/filters.c privoxy-3.0.6-stable_new/filters.c
--- privoxy-3.0.6-stable/filters.c	2006-09-23 15:26:38.000000000 +0200
+++ privoxy-3.0.6-stable_new/filters.c	2007-03-05 11:55:37.000000000 +0100
@@ -1489,7 +1489,9 @@
       {
          if (strcmp(b->name, filtername->str) == 0)
          {
-            int current_hits = 0;
+            int current_hits = 0; /* Number of hits caused by this filter */
+            int job_number   = 0; /* Which job we're currently executing  */
+            int job_hits     = 0; /* How many hits the current job caused */
 
             if ( NULL == b->joblist )
             {
@@ -1501,13 +1503,50 @@
             /* Apply all jobs from the joblist */
             for (job = b->joblist; NULL != job; job = job->next)
             {
-               current_hits += pcrs_execute(job, old, size, &new, &size);
-               if (old != csp->iob->cur) free(old);
-               old=new;
+               job_number++;
+               job_hits = pcrs_execute(job, old, size, &new, &size);
+
+               if (job_hits >= 0)
+               {
+                  /*
+                   * That went well. Continue filtering
+                   * and use the result of this job as
+                   * input for the next one.
+                   */
+                  current_hits += job_hits;
+                  if (old != csp->iob->cur)
+                  {
+                     free(old);
+                  }
+                  old = new;
+               }
+               else
+               {
+                  /*
+                   * The job caused an unexpected error. Inform the user
+                   * and skip the rest of jobs in this filter. We could
+                   * continue with the next job, but usually the jobs
+                   * depend on each other or are similar enough to
+                   * fail with the same reason.
+                   *
+                   * XXX: In theory pcrs_strerror() would
+                   * return a proper error message here.
+                   *
+                   * At the moment, however, our pcrs expects the
+                   * error codes of pcre 3.4 and newer pcre version
+                   * return different error codes. As a result
+                   * pcrs_strerror()'s error message might be bogus,
+                   * therefore we print the numerical value as well.
+                   */
+                  log_error(LOG_LEVEL_ERROR, "Skipped filter \'%s\' after job number %u: %s (%d)",
+                     b->name, job_number, pcrs_strerror (job_hits), job_hits);
+                  break;
+               }
             }
 
-            log_error(LOG_LEVEL_RE_FILTER, "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).",
-                      csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size);
+            log_error(LOG_LEVEL_RE_FILTER,
+               "re_filtering %s%s (size %d) with filter %s produced %d hits (new size %d).",
+               csp->http->hostport, csp->http->path, prev_size, b->name, current_hits, size);
 
             hits += current_hits;
          }