RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-18 17:37:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

rgw/s3website: Fix ErrocDoc memory leak.

Browse Source 
Yehuda pointed [1] out a memory leak with the RGWGetObj not being handed back, and
suggested that shared_ptr was used to handle it, rather than the prior approach
of explicitly calling handler->put_op.

This commit implements just that change, in isolation from other changes, for
ease of comparision testing.

X-Reference-1: https://github.com/ceph/ceph/pull/8669#discussion_r63445516
Signed-off-by: Robin H. Johnson <robin.johnson@dreamhost.com>
This commit is contained in:
Robin H. Johnson 2016-05-17 17:35:41 -07:00
parent fcb3cf169f
commit 2fd7bc8cbe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/rgw/rgw_rest_s3.cc
View File

@ -3960,8 +3960,8 @@ int RGWHandler_REST_S3Website::serve_errordoc(int http_ret, const string& errord
int ret = 0;
s->formatter->reset(); /* Try to throw it all away */
RGWGetObj_ObjStore_S3Website* getop = (RGWGetObj_ObjStore_S3Website*) op_get();
if(!getop) {
std::shared_ptr<RGWGetObj_ObjStore_S3Website> getop( (RGWGetObj_ObjStore_S3Website*) op_get() );
if (getop.get() == NULL) {
return -1; // Trigger double error handler
}
getop->init(store, s, this);
@ -3972,13 +3972,13 @@ int RGWHandler_REST_S3Website::serve_errordoc(int http_ret, const string& errord
getop->if_nomatch = NULL;
s->object = errordoc_key;
ret = init_permissions(getop);
ret = init_permissions(getop.get());
if (ret < 0) {
ldout(s->cct, 20) << "serve_errordoc failed, init_permissions ret=" << ret << dendl;
return -1; // Trigger double error handler
}
ret = read_permissions(getop);
ret = read_permissions(getop.get());
if (ret < 0) {
ldout(s->cct, 20) << "serve_errordoc failed, read_permissions ret=" << ret << dendl;
return -1; // Trigger double error handler