@@ -113,6 +113,15 @@ char *export_stats_to_json(struct cl_engine *engine, cli_intel_t *intel)

         if (!(buf))

             return NULL;

+        snprintf(buf+curused, bufsz-curused, "\t\t\t\"hits\": \"%s\",\n", md5);

+        curused += strlen(buf+curused);

+

+        snprintf(md5, sizeof(md5), "%zu", sample->size);

+

+        buf = ensure_bufsize(buf, &bufsz, curused, strlen(md5) + 20);

+        if (!(buf))

+            return NULL;

+

         snprintf(buf+curused, bufsz-curused, "\t\t\t\"size\": \"%s\",\n", md5);

         curused += strlen(buf+curused);

@@ -398,7 +398,7 @@ struct cl_engine *cl_engine_new(void)

     }

 #endif

     intel->engine = new;

-    intel->maxsamples = 10;

+    intel->maxsamples = STATS_MAX_SAMPLES;

     new->stats_data = intel;

     new->cb_stats_add_sample = clamav_stats_add_sample;

     new->cb_stats_submit = clamav_stats_submit;

@@ -139,6 +139,7 @@ typedef struct cli_ctx_tag {

 } cli_ctx;

 #define STATS_ANON_UUID "5b585e8f-3be5-11e3-bf0b-18037319526c"

+#define STATS_MAX_SAMPLES 50

 typedef struct cli_flagged_sample {

     char **virus_name;

@@ -35,7 +35,7 @@ void clamav_stats_add_sample(const char *virname, const unsigned char *md5, size

     intel = (cli_intel_t *)cbdata;

-    if (intel->nsamples + 1 >= intel->maxsamples) {

+    if (intel->maxsamples && intel->nsamples + 1 >= intel->maxsamples) {

         if (!(intel->engine))

             return;