[ostree] trivial-httpd: Avoid SoupBuffer when there's no content
- From: Matthew Barnes <mbarnes src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [ostree] trivial-httpd: Avoid SoupBuffer when there's no content
- Date: Mon, 23 Nov 2015 19:32:48 +0000 (UTC)
commit 74d8e5f15969e2bf832d060e18c7f8c9f3f11a55
Author: Matthew Barnes <mbarnes redhat com>
Date: Mon Nov 23 14:29:03 2015 -0500
trivial-httpd: Avoid SoupBuffer when there's no content
This was supposed to be merged into the previous commit, but I
messed up.
src/ostree/ot-builtin-trivial-httpd.c | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 deletions(-)
---
diff --git a/src/ostree/ot-builtin-trivial-httpd.c b/src/ostree/ot-builtin-trivial-httpd.c
index c6a3757..b5fb5d0 100644
--- a/src/ostree/ot-builtin-trivial-httpd.c
+++ b/src/ostree/ot-builtin-trivial-httpd.c
@@ -225,8 +225,7 @@ do_get (OtTrivialHttpd *self,
if (msg->method == SOUP_METHOD_GET)
{
- GMappedFile *mapping;
- SoupBuffer *buffer;
+ g_autoptr(GMappedFile) mapping = NULL;
gsize buffer_length, file_size;
SoupRange *ranges;
int ranges_length;
@@ -270,12 +269,17 @@ do_get (OtTrivialHttpd *self,
}
soup_message_headers_free_ranges (msg->request_headers, ranges);
}
- buffer = soup_buffer_new_with_owner (g_mapped_file_get_contents (mapping),
- buffer_length,
- mapping, (GDestroyNotify)g_mapped_file_unref);
- if (buffer->length > 0)
- soup_message_body_append_buffer (msg->response_body, buffer);
- soup_buffer_free (buffer);
+ if (buffer_length > 0)
+ {
+ SoupBuffer *buffer;
+
+ buffer = soup_buffer_new_with_owner (g_mapped_file_get_contents (mapping),
+ buffer_length,
+ g_mapped_file_ref (mapping),
+ (GDestroyNotify)g_mapped_file_unref);
+ soup_message_body_append_buffer (msg->response_body, buffer);
+ soup_buffer_free (buffer);
+ }
}
else /* msg->method == SOUP_METHOD_HEAD */
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]