@@ -1933,11 +1933,13 @@ static int hwpml_scan_cb(void *cbdata, int fd, cli_ctx *ctx)

     return cli_magic_scandesc(fd, ctx);

 }

-static int hwpml_binary_cb(int fd, cli_ctx *ctx, int num_attribs, struct attrib_entry *attribs)

+static int hwpml_binary_cb(int fd, cli_ctx *ctx, int num_attribs, struct attrib_entry *attribs, void *cbdata)

 {

     int i, ret, df = 0, com = 0, enc = 0;

     char *tempfile;

+    UNUSEDPARAM(cbdata);

+

     /* check attributes for compression and encoding */

     for (i = 0; i < num_attribs; i++) {

         if (!strcmp(attribs[i].key, "Compress")) {

@@ -421,7 +421,7 @@ static int msxml_parse_element(struct msxml_ctx *mxctx, xmlTextReaderPtr reader,

                     cli_dbgmsg("msxml_parse_element: extracted binary data to %s\n", tempfile);

-                    ret = mxctx->scan_cb(of, ctx, num_attribs, attribs);

+                    ret = mxctx->scan_cb(of, ctx, num_attribs, attribs, mxctx->scan_data);

                     if (!(ctx->engine->keeptmp))

                         cli_unlink(tempfile);

                     free(tempfile);

@@ -489,9 +489,9 @@ static int msxml_parse_element(struct msxml_ctx *mxctx, xmlTextReaderPtr reader,

                 /* callback-based scanning mechanism for comments (used by MHTML) */

                 if ((keyinfo->type & MSXML_COMMENT_CB) && mxctx->comment_cb) {

 #if HAVE_JSON

-                    ret = mxctx->comment_cb((const char *)node_value, ctx, thisjobj);

+                    ret = mxctx->comment_cb((const char *)node_value, ctx, thisjobj, mxctx->comment_data);

 #else

-                    ret = mxctx->comment_cb((const char *)node_value, ctx, NULL);

+                    ret = mxctx->comment_cb((const char *)node_value, ctx, NULL, mxctx->comment_data);

 #endif

                     if (ret != CL_SUCCESS && (ret != CL_VIRUS || (!SCAN_ALL && ret == CL_VIRUS))) {

                         return ret;

@@ -76,12 +76,14 @@ struct key_entry {

     uint32_t type;

 };

-typedef int (*msxml_scan_cb)(int fd, cli_ctx *ctx, int num_attribs, struct attrib_entry *attribs);

-typedef int (*msxml_comment_cb)(const char *comment, cli_ctx *ctx, void *wrkjobj);

+typedef int (*msxml_scan_cb)(int fd, cli_ctx *ctx, int num_attribs, struct attrib_entry *attribs, void *cbdata);

+typedef int (*msxml_comment_cb)(const char *comment, cli_ctx *ctx, void *wrkjobj, void *cbdata);

 struct msxml_ctx {

     msxml_scan_cb scan_cb;

+    void *scan_data;

     msxml_comment_cb comment_cb;

+    void *comment_data;

     struct msxml_ictx *ictx;

 };