From 8981a232002ceaa43c9cd5e1bb48d238fa04ad2a Mon Sep 17 00:00:00 2001 From: Colin Patrick McCabe Date: Wed, 3 Aug 2011 11:39:40 -0700 Subject: [PATCH] rgw_rest: don't leak formatters Signed-off-by: Colin McCabe --- src/rgw/rgw_rest.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc index 4ce12f1d1351a..4468f72ab2e30 100644 --- a/src/rgw/rgw_rest.cc +++ b/src/rgw/rgw_rest.cc @@ -446,13 +446,16 @@ void init_entities_from_header(struct req_state *s) if (s->prot_flags & RGW_REST_OPENSTACK) { s->format = 0; + delete s->formatter; s->formatter = new RGWFormatter_Plain; string format_str = s->args.get("format"); if (format_str.compare("xml") == 0) { s->format = RGW_FORMAT_XML; + delete s->formatter; s->formatter = new RGWFormatter_XML; } else if (format_str.compare("json") == 0) { s->format = RGW_FORMAT_JSON; + delete s->formatter; s->formatter = new RGWFormatter_JSON; } } -- 2.39.5