Merge pull request #10656: jewel: cors auto memleak

Reviewed-by: Loic Dachary <ldachary@redhat.com>
ceph · Aug 22, 2016 · cdb5cde · cdb5cde
2 parents bf54a86 + fb36dd0
commit cdb5cde
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/rgw/rgw_rest_s3.cc b/src/rgw/rgw_rest_s3.cc
@@ -2162,7 +2162,8 @@ int RGWPutCORS_ObjStore_S3::get_params()
   if (s->aws4_auth_needs_complete) {
     int ret_auth = do_aws4_auth_completion();
     if (ret_auth < 0) {
-      return ret_auth;
+      r = ret_auth;
+      goto done_err;
     }
   }