]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
rgw: put bucket policy panics RGW process 19847/head
authorBingyin Zhang <zhangbingyin@cloudin.cn>
Tue, 26 Dec 2017 09:06:44 +0000 (17:06 +0800)
committerAdam C. Emerson <aemerson@redhat.com>
Mon, 8 Jan 2018 18:33:26 +0000 (13:33 -0500)
Fixes: http://tracker.ceph.com/issues/22541
Signed-off-by: Bingyin Zhang <zhangbingyin@cloudin.cn>
(cherry picked from commit f05a044cad18c16ebc2c9a177f38b4bdc76cfd66)

src/rgw/rgw_iam_policy.cc

index cff4fa493351373f482e5a40d8d22e1a82499929..f8ef3af7996b19d1b9f4eb3757d3fd17cc38ca5b 100644 (file)
@@ -809,7 +809,7 @@ bool ParseState::do_string(CephContext* cct, const char* s, size_t l) {
 
   } else if (w->id == TokenID::Sid) {
     t->sid.emplace(s, l);
-  } else if ((w->id == TokenID::Effect) &&
+  } else if ((w->id == TokenID::Effect) && k &&
             k->kind == TokenKind::effect_key) {
     t->effect = static_cast<Effect>(k->specific);
   } else if (w->id == TokenID::Principal && s && *s == '*') {