* [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix panic on slice range when index is empty
@ 2020-09-29 10:22 Dominik Csapak
0 siblings, 0 replies; only message in thread
From: Dominik Csapak @ 2020-09-29 10:22 UTC (permalink / raw)
To: pbs-devel
since len() and MAX_INDEX_TASKS are both usize, they underflow
instead of getting negative values
instead check the sizes and set them accordingly
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/server/worker_task.rs | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/server/worker_task.rs b/src/server/worker_task.rs
index 2b517a79..be689c7f 100644
--- a/src/server/worker_task.rs
+++ b/src/server/worker_task.rs
@@ -418,9 +418,20 @@ fn update_active_workers(new_upid: Option<&UPID>) -> Result<(), Error> {
}
});
- let start = (finish_list.len()-MAX_INDEX_TASKS).max(0);
+
+ let start = if finish_list.len() > MAX_INDEX_TASKS {
+ finish_list.len() - MAX_INDEX_TASKS
+ } else {
+ 0
+ };
+
let end = (start+MAX_INDEX_TASKS).min(finish_list.len());
- let index_raw = render_task_list(&finish_list[start..end]);
+
+ let index_raw = if end > start {
+ render_task_list(&finish_list[start..end])
+ } else {
+ "".to_string()
+ };
replace_file(
PROXMOX_BACKUP_INDEX_TASK_FN,
--
2.20.1
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-09-29 10:22 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-09-29 10:22 [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix panic on slice range when index is empty Dominik Csapak
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal