@@ -130,6 +130,7 @@ static struct dconf_module modules[] = {

     { "OTHER",      "PREFILTERING", OTHER_CONF_PREFILTERING,1 },

     { "OTHER",      "PDFNAMEOBJ",   OTHER_CONF_PDFNAMEOBJ,  1 },

     { "OTHER",      "PRTNINTXN",   OTHER_CONF_PRTNINTXN,  1 },

+    { "OTHER",      "LZW",      OTHER_CONF_LZW,     1 },

     { "PHISHING",   "ENGINE",       PHISHING_CONF_ENGINE,   1 },

     { "PHISHING",   "ENTCONV",      PHISHING_CONF_ENTCONV,  1 },

@@ -121,6 +121,7 @@ struct cli_dconf {

 #define OTHER_CONF_PREFILTERING 0x80

 #define OTHER_CONF_PDFNAMEOBJ	0x100

 #define OTHER_CONF_PRTNINTXN	0x200

+#define OTHER_CONF_LZW		0x400

 /* Phishing flags */

 #define PHISHING_CONF_ENGINE   0x1

@@ -211,8 +211,21 @@ static int pdf_decodestream_internal(struct pdf_struct *pdf, struct pdf_obj *obj

         }

         if (rc != CL_SUCCESS) {

-            cli_dbgmsg("cli_pdf: error decoding, breaking after %d (of %lu) filters\n",

-                       i, (long unsigned)(obj->numfilters));

+            const char *reason;

+            switch (rc) {

+            case CL_VIRUS:

+                reason = "detection";

+                break;

+            case CL_BREAK:

+                reason = "break decoding";

+                break;

+            default:

+                reason = "error decoding";

+                break;

+            }

+

+            cli_dbgmsg("cli_pdf: %s, stopping after %d (of %lu) filters\n",

+                       reason, i, (long unsigned)(obj->numfilters));

             break;

         }

@@ -726,6 +739,9 @@ static int filter_lzwdecode(struct pdf_struct *pdf, struct pdf_obj *obj, struct

     lzw_stream stream;

     int echg = 1, lzwstat, skip = 0, rc = CL_SUCCESS;

+    if (pdf->ctx && !(pdf->ctx->dconf->other & OTHER_CONF_LZW))

+        return CL_BREAK;

+

     if (params) {

         struct pdf_dict_node *node = params->nodes;