From 290887912f40ae864f2100d2056f03ac3bdd1af2 Mon Sep 17 00:00:00 2001 From: "Darryl L. Miles" Date: Sun, 29 Sep 2024 23:00:00 +0100 Subject: [PATCH] ext2spice/ext2hier.c: Wrong type of arguments to formatting function Applied the same fixes as other commits already merged into file. Copilot Autofix: Error contact support... CodeQL: https://github.com/dlmiles/magic/security/code-scanning/38 https://github.com/dlmiles/magic/security/code-scanning/39 https://github.com/dlmiles/magic/security/code-scanning/41 --- ext2spice/ext2hier.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ext2spice/ext2hier.c b/ext2spice/ext2hier.c index fbde50e0..725374b1 100644 --- a/ext2spice/ext2hier.c +++ b/ext2spice/ext2hier.c @@ -262,7 +262,7 @@ spcHierWriteParams(hc, dev, scale, l, w, sdM) if (esScale < 0) fprintf(esSpiceF, "%g", l * scale); else if (plist->parm_scale != 1.0) - fprintf(esSpiceF, "%g", l * scale * esScale + fprintf(esSpiceF, "%g", (double)l * scale * esScale * plist->parm_scale * 1E-6); else esSIvalue(esSpiceF, 1.0E-6 * (l + plist->parm_offset) @@ -286,7 +286,7 @@ spcHierWriteParams(hc, dev, scale, l, w, sdM) if (esScale < 0) fprintf(esSpiceF, "%g", dval * scale); else if (plist->parm_scale != 1.0) - fprintf(esSpiceF, "%g", dval * scale * esScale + fprintf(esSpiceF, "%g", (double)dval * scale * esScale * plist->parm_scale * 1E-6); else esSIvalue(esSpiceF, (dval + plist->parm_offset) @@ -321,8 +321,8 @@ spcHierWriteParams(hc, dev, scale, l, w, sdM) if (esScale < 0) fprintf(esSpiceF, "%g", dev->dev_rect.r_xbot * scale); else if (plist->parm_scale != 1.0) - fprintf(esSpiceF, "%g", dev->dev_rect.r_xbot * scale - * esScale * plist->parm_scale * 1E-6); + fprintf(esSpiceF, "%g", (double)dev->dev_rect.r_xbot * (double)scale + * (double)esScale * (double)plist->parm_scale * 1E-6); else esSIvalue(esSpiceF, (dev->dev_rect.r_xbot + plist->parm_offset) * scale * esScale * 1.0E-6);