mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 16:47:44 +00:00
LibCore: Protect Core::Group against null group::gr_mem members
Serenity's implementation does not set this pointer to anything, so we should not assume it was set.
This commit is contained in:
parent
d09266237d
commit
e305b32d9a
1 changed files with 9 additions and 5 deletions
|
@ -33,8 +33,10 @@ ErrorOr<DeprecatedString> Group::generate_group_file() const
|
|||
builder.appendff("{}:x:{}:{}\n", m_name, m_id, DeprecatedString::join(',', m_members));
|
||||
else {
|
||||
Vector<DeprecatedString> members;
|
||||
for (size_t i = 0; group->gr_mem[i]; ++i)
|
||||
members.append(group->gr_mem[i]);
|
||||
if (group->gr_mem) {
|
||||
for (size_t i = 0; group->gr_mem[i]; ++i)
|
||||
members.append(group->gr_mem[i]);
|
||||
}
|
||||
|
||||
builder.appendff("{}:x:{}:{}\n", group->gr_name, group->gr_gid, DeprecatedString::join(',', members));
|
||||
}
|
||||
|
@ -129,10 +131,12 @@ ErrorOr<Vector<Group>> Group::all()
|
|||
break;
|
||||
|
||||
Vector<DeprecatedString> members;
|
||||
for (size_t i = 0; group->gr_mem[i]; ++i)
|
||||
members.append(group->gr_mem[i]);
|
||||
if (group->gr_mem) {
|
||||
for (size_t i = 0; group->gr_mem[i]; ++i)
|
||||
members.append(group->gr_mem[i]);
|
||||
}
|
||||
|
||||
groups.append({ group->gr_name, group->gr_gid, members });
|
||||
groups.append({ group->gr_name, group->gr_gid, move(members) });
|
||||
}
|
||||
|
||||
return groups;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue