From: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
Date: Fri, 13 Oct 2017 17:52:33 +0000 (+0200)
Subject: rgw/rgw_op.cc: fix wrong function order
X-Git-Tag: v13.0.1~358^2~18
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=4d2f8384d0beb711979d993b8a15084dc884d008;p=ceph.git

rgw/rgw_op.cc: fix wrong function order

Fix for:

[src/rgw/rgw_op.cc:3829]: (error) Uninitialized variable: calc_md5

Signed-off-by: Danny Al-Gaaf <danny.al-gaaf@bisect.de>
---

diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc
index ca9a6f40f70..670ff6aa86d 100644
--- a/src/rgw/rgw_op.cc
+++ b/src/rgw/rgw_op.cc
@@ -3831,10 +3831,6 @@ void RGWPostObj::execute()
 
     s->obj_size = ofs;
 
-    if (supplied_md5_b64 && strcmp(calc_md5, supplied_md5)) {
-      op_ret = -ERR_BAD_DIGEST;
-      return;
-    }
 
     op_ret = store->check_quota(s->bucket_owner.get_id(), s->bucket,
                                 user_quota, bucket_quota, s->obj_size);
@@ -3851,6 +3847,12 @@ void RGWPostObj::execute()
     buf_to_hex(m, CEPH_CRYPTO_MD5_DIGESTSIZE, calc_md5);
 
     etag = calc_md5;
+    
+    if (supplied_md5_b64 && strcmp(calc_md5, supplied_md5)) {
+      op_ret = -ERR_BAD_DIGEST;
+      return;
+    }
+
     bl.append(etag.c_str(), etag.size() + 1);
     emplace_attr(RGW_ATTR_ETAG, std::move(bl));