emo/shadow
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix usermod crash

Browse Source 
Return newly allocated pointers when the caller will free them.

Closes #110
This commit is contained in:
fariouche 2018-05-08 21:17:46 -05:00 committed by Serge Hallyn
parent f50603a5fc
commit 73a876a056
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmisc/prefix_flag.c
View File

@ -333,7 +333,7 @@ extern struct group *prefix_getgr_nam_gid(const char *grname)
&& (gid == (gid_t)gid)) { && (gid == (gid_t)gid)) {
return prefix_getgrgid ((gid_t) gid); return prefix_getgrgid ((gid_t) gid);
} }
return prefix_getgrnam (grname); return __gr_dup(prefix_getgrnam (grname));
} }
else else
return getgr_nam_gid(grname); return getgr_nam_gid(grname);

4
src/usermod.c
View File

@ -1251,12 +1251,14 @@ static void process_flags (int argc, char **argv)
prefix_user_home = xmalloc(len); prefix_user_home = xmalloc(len);
wlen = snprintf(prefix_user_home, len, "%s/%s", prefix, user_home); wlen = snprintf(prefix_user_home, len, "%s/%s", prefix, user_home);
assert (wlen == (int) len -1); assert (wlen == (int) len -1);
if (user_newhome) {
len = strlen(prefix) + strlen(user_newhome) + 2; len = strlen(prefix) + strlen(user_newhome) + 2;
prefix_user_newhome = xmalloc(len); prefix_user_newhome = xmalloc(len);
wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome); wlen = snprintf(prefix_user_newhome, len, "%s/%s", prefix, user_newhome);
assert (wlen == (int) len -1); assert (wlen == (int) len -1);
} }
}
else { else {
prefix_user_home = user_home; prefix_user_home = user_home;
prefix_user_newhome = user_newhome; prefix_user_newhome = user_newhome;