@@ -104,7 +104,7 @@ int cli_scanmbr(cli_ctx *ctx)

         return CL_ENULLARG;

     }

-    /* sector size calculation */

+    /* sector size calculation, actual value is OS dependent */

     sectorsize = MBR_SECTOR_SIZE;

     /* size of total file must be a multiple of the sector size */

@@ -133,6 +133,13 @@ int cli_scanmbr(cli_ctx *ctx)

         return ret;

     }

+    /* MBR is valid, examine bootstrap code */

+    ret = cli_map_scan(*ctx->fmap, 0, MBR_BASE_OFFSET, ctx, CL_TYPE_FILE_ANY);

+    if ((ret != CL_CLEAN) &&

+        !((ctx->options & CL_SCAN_ALLMATCHES) && (ret == CL_VIRUS))) {

+        return ret;

+    }

+

     /* check that the partition table has no intersections - HEURISTICS */

     if ((ctx->options & CL_SCAN_PARTITION_INTXN) && (ctx->dconf->other & OTHER_CONF_PRTNINTXN)) {

         ret = mbr_primary_prtn_intxn(ctx, mbr, sectorsize);