@@ -798,6 +798,10 @@ static int cli_scanxz(cli_ctx *ctx)

         /* xz decompress a chunk */

 	rc = cli_XzDecode(&strm);

 	if (XZ_RESULT_OK != rc && XZ_STREAM_END != rc) {

+            if (rc == XZ_DIC_HEURISTIC) {

+                ret = cli_append_virus(ctx, "Heuristic.XZ.DicSizeLimit");

+                goto xz_exit;

+            }

 	    cli_errmsg("cli_scanxz: decompress error: %d\n", rc);

             ret = CL_EFORMAT;

             goto xz_exit;

@@ -76,7 +76,11 @@ int cli_XzDecode(struct CLI_XZ *XZ) {

         return XZ_STREAM_END;

     if (XZ->status == CODER_STATUS_NOT_FINISHED && XZ->avail_out == 0)

         return XZ_RESULT_OK;

-    if (((inbytes == 0) && (outbytes == 0)) || res != SZ_OK)

+    if (((inbytes == 0) && (outbytes == 0)) || res != SZ_OK) {

+        if (res == SZ_ERROR_MEM) {

+            return XZ_DIC_HEURISTIC;

+        }

 	return XZ_RESULT_DATA_ERROR;

+    }

     return XZ_RESULT_OK;

 }

@@ -43,6 +43,8 @@ int cli_XzDecode(struct CLI_XZ *);

 #define XZ_RESULT_DATA_ERROR 1

 #define XZ_STREAM_END 2

+#define XZ_DIC_HEURISTIC 3

+

 #define CLI_XZ_OBUF_SIZE 1024*1024

 #define CLI_XZ_IBUF_SIZE CLI_XZ_OBUF_SIZE>>2 /* compression ratio 25% */