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

Merge pull request #1939 from jlebon/pr/fix-keyfile-leak 

src/libotutil: Fix strv memory leak
This commit is contained in:
OpenShift Merge Robot 2019-10-15 19:13:56 +02:00 committed by GitHub
parent 72c7619bff 9344de1ce1
commit 0eb235fa2d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libotutil/ot-keyfile-utils.c
View File

@ -154,7 +154,7 @@ ot_keyfile_get_string_list_with_separator_choice (GKeyFile *keyfile,
guint sep_count = 0; guint sep_count = 0;
gchar sep = '\0'; gchar sep = '\0';
g_autofree char *value_str = NULL; g_autofree char *value_str = NULL;
g_autofree char **value_list = NULL; g_auto(GStrv) value_list = NULL;
g_return_val_if_fail (keyfile != NULL, FALSE); g_return_val_if_fail (keyfile != NULL, FALSE);
g_return_val_if_fail (section != NULL, FALSE); g_return_val_if_fail (section != NULL, FALSE);
@ -215,8 +215,8 @@ ot_keyfile_get_string_list_with_default (GKeyFile *keyfile,
g_key_file_set_list_separator (keyfile, separator); g_key_file_set_list_separator (keyfile, separator);
g_autofree char **ret_value = g_key_file_get_string_list (keyfile, section, g_auto(GStrv) ret_value = g_key_file_get_string_list (keyfile, section,
key, NULL, &temp_error); key, NULL, &temp_error);
if (temp_error) if (temp_error)
{ {
@ -224,7 +224,7 @@ ot_keyfile_get_string_list_with_default (GKeyFile *keyfile,
G_KEY_FILE_ERROR_KEY_NOT_FOUND)) G_KEY_FILE_ERROR_KEY_NOT_FOUND))
{ {
g_clear_error (&temp_error); g_clear_error (&temp_error);
ret_value = default_value; ret_value = g_strdupv (default_value);
} }
else else
{ {