packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ASAN] metalink: Fix leaks of buffer 

We should be religious about the "only set output variables on
success", otherwise it makes leaks more likely.

But the real leak was us simply not using autoptr in one place.

Closes: #598
Approved by: jlebon
This commit is contained in:
Colin Walters 2016-11-28 22:01:33 -05:00 committed by Atomic Bot
parent 1bb6e51486
commit d83d5b4a29
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/libostree/ostree-metalink.c
View File

@ -479,7 +479,7 @@ try_one_url (OstreeMetalinkRequest *self,
ret = TRUE; ret = TRUE;
if (out_data) if (out_data)
*out_data = g_bytes_ref (bytes); *out_data = g_steal_pointer (&bytes);
out: out:
return ret; return ret;
} }
@ -492,6 +492,7 @@ try_metalink_targets (OstreeMetalinkRequest *self,
{ {
gboolean ret = FALSE; gboolean ret = FALSE;
SoupURI *target_uri = NULL; SoupURI *target_uri = NULL;
g_autoptr(GBytes) ret_data = NULL;
if (!self->found_a_file_element) if (!self->found_a_file_element)
{ {
@ -546,7 +547,7 @@ try_metalink_targets (OstreeMetalinkRequest *self,
target_uri = self->urls->pdata[self->current_url_index]; target_uri = self->urls->pdata[self->current_url_index];
if (try_one_url (self, target_uri, out_data, &temp_error)) if (try_one_url (self, target_uri, &ret_data, &temp_error))
break; break;
else else
{ {
@ -568,6 +569,8 @@ try_metalink_targets (OstreeMetalinkRequest *self,
ret = TRUE; ret = TRUE;
if (out_target_uri) if (out_target_uri)
*out_target_uri = soup_uri_copy (target_uri); *out_target_uri = soup_uri_copy (target_uri);
if (out_data)
*out_data = g_steal_pointer (&ret_data);
out: out:
return ret; return ret;
} }
@ -599,7 +602,7 @@ _ostree_metalink_request_sync (OstreeMetalink *self,
gboolean ret = FALSE; gboolean ret = FALSE;
OstreeMetalinkRequest request = { 0, }; OstreeMetalinkRequest request = { 0, };
g_autoptr(GMainContext) mainctx = NULL; g_autoptr(GMainContext) mainctx = NULL;
GBytes *out_contents = NULL; g_autoptr(GBytes) contents = NULL;
gsize len; gsize len;
const guint8 *data; const guint8 *data;
@ -614,13 +617,13 @@ _ostree_metalink_request_sync (OstreeMetalink *self,
self->uri, self->uri,
FALSE, FALSE,
FALSE, FALSE,
&out_contents, &contents,
self->max_size, self->max_size,
cancellable, cancellable,
error)) error))
goto out; goto out;
data = g_bytes_get_data (out_contents, &len); data = g_bytes_get_data (contents, &len);
if (!g_markup_parse_context_parse (request.parser, (const char*)data, len, error)) if (!g_markup_parse_context_parse (request.parser, (const char*)data, len, error))
goto out; goto out;