[pbs-devel] [PATCH v2 pbs] fix #4638: proxmox-backup-client: status: guard against div by zero

Thomas Lamprecht t.lamprecht at proxmox.com
Wed Jun 7 13:13:57 CEST 2023


Am 07/06/2023 um 10:55 schrieb Maximiliano Sandoval:
> We throw an error if the value for total is zero.
> 
> Signed-off-by: Maximiliano Sandoval <m.sandoval at proxmox.com>
> ---
> Previous patch contained a wrong email.
> 
>  proxmox-backup-client/src/main.rs | 9 ++++++---
>  1 file changed, 6 insertions(+), 3 deletions(-)
> 
> diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs
> index 55198108..5a804d95 100644
> --- a/proxmox-backup-client/src/main.rs
> +++ b/proxmox-backup-client/src/main.rs
> @@ -1590,9 +1590,12 @@ async fn status(param: Value) -> Result<Value, Error> {
>          let v = v.as_u64().unwrap();
>          let total = record["total"].as_u64().unwrap();
>          let roundup = total / 200;
> -        let per = ((v + roundup) * 100) / total;
> -        let info = format!(" ({} %)", per);
> -        Ok(format!("{} {:>8}", v, info))
> +        if let Some(per) = ((v + roundup) * 100).checked_div(total) {
> +            let info = format!(" ({} %)", per);

FYI: When touching existing format lines, please feel encouraged to switch over
to using template variables wherever possible:

let info = format!(" ({per} %)");
Ok(format!("{v} {info:>8}"))

> +            Ok(format!("{} {:>8}", v, info))
> +        } else {
> +            bail!("Cannot render total percentage: denominator is zero");
> +        }
>      };
>  
>      let options = default_table_format_options()






More information about the pbs-devel mailing list