From 3967ce4e39f60b32b5d8289eb80d273835c917a8 Mon Sep 17 00:00:00 2001 From: Danny Al-Gaaf Date: Mon, 18 Mar 2013 12:45:15 +0100 Subject: [PATCH] rgw/rgw_rados.cc: make sure range_iter != ranges.end() Make sure range_iter is valid, set range_iter = next_iter instead of ++range_iter, since next_iter is already checked against ranges.end() and is the same as ++range_iter. Signed-off-by: Danny Al-Gaaf --- src/rgw/rgw_rados.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index d66c6b4cabcfe..85a631902fa30 100644 --- a/src/rgw/rgw_rados.cc +++ b/src/rgw/rgw_rados.cc @@ -2490,7 +2490,7 @@ int RGWRados::clone_objs_impl(void *ctx, rgw_obj& dst_obj, if (range.src_ofs + (int64_t)range.len != next.src_ofs || range.dst_ofs + (int64_t)range.len != next.dst_ofs) break; - ++range_iter; + range_iter = next_iter; range.len += next.len; } if (range.len) { -- 2.39.5