From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id ABCB8621BC for ; Tue, 29 Sep 2020 12:22:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 523B9E9B5 for ; Tue, 29 Sep 2020 12:22:04 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 27900E9A9 for ; Tue, 29 Sep 2020 12:22:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id E128845829 for ; Tue, 29 Sep 2020 12:22:02 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Tue, 29 Sep 2020 12:22:02 +0200 Message-Id: <20200929102202.17236-1-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.159 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_NONE 0.001 SPF: sender does not publish an SPF Record Subject: [pbs-devel] [PATCH proxmox-backup] server/worker_task: fix panic on slice range when index is empty X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 29 Sep 2020 10:22:04 -0000 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 --- 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