From 93f17d73eab9e3263c4058a1900a03ce213137a4 Mon Sep 17 00:00:00 2001 From: "Steinar H. Gunderson" Date: Fri, 9 Jun 2017 01:00:09 +0200 Subject: [PATCH] Fix a leak when getting metrics. --- httpd.cpp | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/httpd.cpp b/httpd.cpp index 4d5966b..e76cc80 100644 --- a/httpd.cpp +++ b/httpd.cpp @@ -78,6 +78,16 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, framing = HTTPD::Stream::FRAMING_RAW; } + if (strcmp(url, "/metrics") == 0) { + string contents = global_metrics.serialize(); + MHD_Response *response = MHD_create_response_from_buffer( + contents.size(), &contents[0], MHD_RESPMEM_MUST_COPY); + MHD_add_response_header(response, "Content-type", "text/plain"); + int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); + MHD_destroy_response(response); // Only decreases the refcount; actual free is after the request is done. + return ret; + } + HTTPD::Stream *stream = new HTTPD::Stream(this, framing); stream->add_data(header.data(), header.size(), Stream::DATA_TYPE_HEADER); { @@ -86,21 +96,12 @@ int HTTPD::answer_to_connection(MHD_Connection *connection, } *con_cls = stream; - MHD_Response *response; - - if (strcmp(url, "/metrics") == 0) { - string contents = global_metrics.serialize(); - response = MHD_create_response_from_buffer( - contents.size(), &contents[0], MHD_RESPMEM_MUST_COPY); - MHD_add_response_header(response, "Content-type", "text/plain"); - } else { - // Does not strictly have to be equal to MUX_BUFFER_SIZE. - response = MHD_create_response_from_callback( - (size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); - // TODO: Content-type? - if (framing == HTTPD::Stream::FRAMING_METACUBE) { - MHD_add_response_header(response, "Content-encoding", "metacube"); - } + // Does not strictly have to be equal to MUX_BUFFER_SIZE. + MHD_Response *response = MHD_create_response_from_callback( + (size_t)-1, MUX_BUFFER_SIZE, &HTTPD::Stream::reader_callback_thunk, stream, &HTTPD::free_stream); + // TODO: Content-type? + if (framing == HTTPD::Stream::FRAMING_METACUBE) { + MHD_add_response_header(response, "Content-encoding", "metacube"); } int ret = MHD_queue_response(connection, MHD_HTTP_OK, response); -- 2.39.2