Skip to content

Commit

Permalink
rgw: fix RGWObjManifestRule decoder
Browse files Browse the repository at this point in the history
Only decode the new field if it is a new struct.

Fixes: ceph#8804
Backport: firefly
Signed-off-by: Sage Weil <[email protected]>
Reviewed-by: Josh Durgin <[email protected]>
  • Loading branch information
Sage Weil committed Jul 10, 2014
1 parent 29c2bb2 commit c4afaf9
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/rgw/rgw_rados.h
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,8 @@ struct RGWObjManifestRule {
::decode(start_ofs, bl);
::decode(part_size, bl);
::decode(stripe_max_size, bl);
::decode(override_prefix, bl);
if (struct_v >= 2)
::decode(override_prefix, bl);
DECODE_FINISH(bl);
}
void dump(Formatter *f) const;
Expand Down

0 comments on commit c4afaf9

Please sign in to comment.