keremet/rpm-ostree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libpriv/passwd-util: Fix leaks on error path

Browse Source 
Allocate new memory *after* the potential error exit, not before.

Closes: #1620
Approved by: cgwalters
This commit is contained in:
Jonathan Lebon 2018-10-15 17:43:21 -04:00 committed by Atomic Bot
parent 700ab613ee
commit 3a6315aac9
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/libpriv/rpmostree-passwd-util.c
View File

@ -414,7 +414,6 @@ rpmostree_check_passwd_groups (gboolean passwd,
JsonNodeType child_type = json_node_get_node_type (val);
gint64 uid = 0;
gint64 gid = 0;
struct conv_passwd_ent *convent = g_new (struct conv_passwd_ent, 1);
if (child_type != JSON_NODE_ARRAY)
{
@ -438,6 +437,7 @@ rpmostree_check_passwd_groups (gboolean passwd,
return FALSE;
}
struct conv_passwd_ent *convent = g_new (struct conv_passwd_ent, 1);
convent->name = g_strdup (name);
convent->uid = uid;
convent->gid = gid;
@ -447,11 +447,11 @@ rpmostree_check_passwd_groups (gboolean passwd,
{
const char *name = iter->data;
gint64 gid = 0;
struct conv_group_ent *convent = g_new (struct conv_group_ent, 1);
if (!_rpmostree_jsonutil_object_require_int_member (ents_obj, name, &gid, error))
return FALSE;
struct conv_group_ent *convent = g_new (struct conv_group_ent, 1);
convent->name = g_strdup (name);
convent->gid = gid;
g_ptr_array_add (old_ents, convent);