diff --git a/src/rgw/rgw_op.cc b/src/rgw/rgw_op.cc index 87710fc744a..06c504eee65 100644 --- a/src/rgw/rgw_op.cc +++ b/src/rgw/rgw_op.cc @@ -522,6 +522,12 @@ int RGWOp::init_quota() static bool validate_cors_rule_method(RGWCORSRule *rule, const char *req_meth) { uint8_t flags = 0; + + if (!req_meth) { + dout(5) << "req_meth is null" << dendl; + return false; + } + if (strcmp(req_meth, "GET") == 0) flags = RGW_CORS_GET; else if (strcmp(req_meth, "POST") == 0) flags = RGW_CORS_POST; else if (strcmp(req_meth, "PUT") == 0) flags = RGW_CORS_PUT; @@ -627,11 +633,12 @@ bool RGWOp::generate_cors_headers(string& origin, string& method, string& header req_meth = s->info.method; } - if (req_meth) + if (req_meth) { method = req_meth; - /* CORS 6.2.5. */ - if (!validate_cors_rule_method(rule, req_meth)) { - return false; + /* CORS 6.2.5. */ + if (!validate_cors_rule_method(rule, req_meth)) { + return false; + } } /* CORS 6.2.4. */