diff options
| author | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-03-18 12:45:15 +0100 |
|---|---|---|
| committer | Danny Al-Gaaf <danny.al-gaaf@bisect.de> | 2013-03-18 12:45:15 +0100 |
| commit | 3967ce4e39f60b32b5d8289eb80d273835c917a8 (patch) | |
| tree | 4cebce34af6100259e5f4005a601869b4ff3988b | |
| parent | 5b8a5059068b8b783769d1306f529921b4c29956 (diff) | |
| download | ceph-3967ce4e39f60b32b5d8289eb80d273835c917a8.tar.gz | |
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 <danny.al-gaaf@bisect.de>
| -rw-r--r-- | src/rgw/rgw_rados.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/rgw/rgw_rados.cc b/src/rgw/rgw_rados.cc index d66c6b4cabc..85a631902fa 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) { |