From: Yehuda Sadeh <yehuda@redhat.com>
Date: Fri, 22 Jan 2016 00:09:23 +0000 (-0800)
Subject: rgw: fix null dereference
X-Git-Tag: v10.0.4~152^2^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f55fe9f4c21d694f33a0acf98054f011688b8e5c;p=ceph.git

rgw: fix null dereference

Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
---

diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index e0b4cc6f323..5fbee746055 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -673,7 +673,11 @@ done:
   }
 
   int http_ret = s->err.http_ret;
-  int op_ret = op->get_ret();
+
+  int op_ret = 0;
+  if (op) {
+    op_ret = op->get_ret();
+  }
 
   req->log_format(s, "op status=%d", op_ret);
   req->log_format(s, "http status=%d", http_ret);