* [pbs-devel] [PATCH] fix #4638: proxmox-backup-client: status: guard against div by zero
@ 2023-06-06 12:30 Maximiliano Sandoval
2023-06-07 7:40 ` Dietmar Maurer
0 siblings, 1 reply; 2+ messages in thread
From: Maximiliano Sandoval @ 2023-06-06 12:30 UTC (permalink / raw)
To: pbs-devel; +Cc: Maximiliano Sandoval
From: Maximiliano Sandoval <msandoval@haya.proxmox.com>
We throw an error if the value for total is zero.
Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
---
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);
+ Ok(format!("{} {:>8}", v, info))
+ } else {
+ bail!("Cannot render total percentage: denominator is zero");
+ }
};
let options = default_table_format_options()
--
2.30.2
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [pbs-devel] [PATCH] fix #4638: proxmox-backup-client: status: guard against div by zero
2023-06-06 12:30 [pbs-devel] [PATCH] fix #4638: proxmox-backup-client: status: guard against div by zero Maximiliano Sandoval
@ 2023-06-07 7:40 ` Dietmar Maurer
0 siblings, 0 replies; 2+ messages in thread
From: Dietmar Maurer @ 2023-06-07 7:40 UTC (permalink / raw)
To: Proxmox Backup Server development discussion, Maximiliano Sandoval
Cc: Maximiliano Sandoval
Please can you set the correct email address in git config?
Otherwise the patch looks ok for me, thanks!
> On 06/06/2023 2:30 PM CEST Maximiliano Sandoval <m.sandoval@proxmox.com> wrote:
>
>
> From: Maximiliano Sandoval <msandoval@haya.proxmox.com>
>
> We throw an error if the value for total is zero.
>
> Signed-off-by: Maximiliano Sandoval <m.sandoval@proxmox.com>
> ---
> 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);
> + Ok(format!("{} {:>8}", v, info))
> + } else {
> + bail!("Cannot render total percentage: denominator is zero");
> + }
> };
>
> let options = default_table_format_options()
> --
> 2.30.2
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2023-06-07 7:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-06 12:30 [pbs-devel] [PATCH] fix #4638: proxmox-backup-client: status: guard against div by zero Maximiliano Sandoval
2023-06-07 7:40 ` Dietmar Maurer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox