Merge pull request #2778 from pwithnall/small-leaks
Fix a couple of small leaks
This commit is contained in:
commit
9d652be3b1
|
|
@ -4712,6 +4712,7 @@ ostree_repo_pull_with_options (OstreeRepo *self,
|
||||||
!load_remote_repo_config (pull_data, &remote_config, cancellable, error))
|
!load_remote_repo_config (pull_data, &remote_config, cancellable, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
||||||
|
g_clear_pointer (&remote_mode_str, g_free);
|
||||||
if (!ot_keyfile_get_value_with_default (remote_config, "core", "mode", "bare",
|
if (!ot_keyfile_get_value_with_default (remote_config, "core", "mode", "bare",
|
||||||
&remote_mode_str, error))
|
&remote_mode_str, error))
|
||||||
goto out;
|
goto out;
|
||||||
|
|
|
||||||
|
|
@ -211,7 +211,7 @@ ostree_builtin_pull_local (int argc, char **argv, OstreeCommandInvocation *invoc
|
||||||
if (!console.is_tty)
|
if (!console.is_tty)
|
||||||
{
|
{
|
||||||
g_assert (progress);
|
g_assert (progress);
|
||||||
const char *status = ostree_async_progress_get_status (progress);
|
g_autofree char *status = ostree_async_progress_get_status (progress);
|
||||||
if (status)
|
if (status)
|
||||||
g_print ("%s\n", status);
|
g_print ("%s\n", status);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -389,7 +389,7 @@ ostree_builtin_pull (int argc, char **argv, OstreeCommandInvocation *invocation,
|
||||||
if (!console.is_tty && !opt_dry_run)
|
if (!console.is_tty && !opt_dry_run)
|
||||||
{
|
{
|
||||||
g_assert (progress);
|
g_assert (progress);
|
||||||
const char *status = ostree_async_progress_get_status (progress);
|
g_autofree char *status = ostree_async_progress_get_status (progress);
|
||||||
if (status)
|
if (status)
|
||||||
g_print ("%s\n", status);
|
g_print ("%s\n", status);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue