fix misuse of getpwuid_r in cuserid
authorRich Felker <dalias@aerifal.cx>
Sat, 13 Feb 2021 18:59:44 +0000 (13:59 -0500)
committerRich Felker <dalias@aerifal.cx>
Sat, 13 Feb 2021 18:59:44 +0000 (13:59 -0500)
getpwuid_r can return 0 but without a result in the case where there
was no error but no record exists. in that case cuserid was treating
it as success and copying junk out of pw.pw_name to the output buffer.

src/legacy/cuserid.c

index 3ff115a..07866ac 100644 (file)
@@ -9,7 +9,8 @@ char *cuserid(char *buf)
        static char usridbuf[L_cuserid];
        struct passwd pw, *ppw;
        long pwb[256];
-       if (getpwuid_r(geteuid(), &pw, (void *)pwb, sizeof pwb, &ppw))
+       getpwuid_r(geteuid(), &pw, (void *)pwb, sizeof pwb, &ppw);
+       if (!ppw)
                return 0;
        size_t len = strnlen(pw.pw_name, L_cuserid);
        if (len == L_cuserid)