diff options
| author | Yehuda Sadeh <yehuda@redhat.com> | 2016-01-22 01:09:23 +0100 |
|---|---|---|
| committer | Yehuda Sadeh <yehuda@redhat.com> | 2016-01-22 01:09:23 +0100 |
| commit | f55fe9f4c21d694f33a0acf98054f011688b8e5c (patch) | |
| tree | 22d1dac96e44ed29c9b289699d5569c468e4d391 /src/rgw/rgw_main.cc | |
| parent | rgw: don't abort on op_ret < 0 (diff) | |
| download | ceph-f55fe9f4c21d694f33a0acf98054f011688b8e5c.tar.xz ceph-f55fe9f4c21d694f33a0acf98054f011688b8e5c.zip | |
rgw: fix null dereference
Signed-off-by: Yehuda Sadeh <yehuda@redhat.com>
Diffstat (limited to 'src/rgw/rgw_main.cc')
| -rw-r--r-- | src/rgw/rgw_main.cc | 6 |
1 files changed, 5 insertions, 1 deletions
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); |