From f579d6d9b42ef03d639cc7356b2fa15265074120 Mon Sep 17 00:00:00 2001
From: Alex Auvolat <alex@adnab.me>
Date: Thu, 31 Aug 2023 11:29:54 +0200
Subject: lifecycle worker: fix potential inifinite loop

---
 src/model/s3/lifecycle_worker.rs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/model')

diff --git a/src/model/s3/lifecycle_worker.rs b/src/model/s3/lifecycle_worker.rs
index 53c84a17..0747ffb8 100644
--- a/src/model/s3/lifecycle_worker.rs
+++ b/src/model/s3/lifecycle_worker.rs
@@ -193,7 +193,10 @@ impl Worker for LifecycleWorker {
 					if skip == Skip::SkipBucket {
 						let bucket_id_len = object.bucket_id.as_slice().len();
 						assert_eq!(pos.get(..bucket_id_len), Some(object.bucket_id.as_slice()));
-						*pos = [&pos[..bucket_id_len], &[0xFFu8][..]].concat();
+						*pos = std::cmp::max(
+							next_pos,
+							[&pos[..bucket_id_len], &[0xFFu8][..]].concat(),
+						);
 					} else {
 						*pos = next_pos;
 					}
-- 
cgit v1.2.3