[commits] r11170 - in /fsf/trunk/libc: ChangeLog sysdeps/unix/sysv/linux/getlogin_r.c

[eglibc@xxxxxxxxxx]

Author: eglibc
Date: Sat Aug  7 00:02:57 2010
New Revision: 11170

Log:
Import glibc-mainline for 2010-08-07

Modified:
    fsf/trunk/libc/ChangeLog
    fsf/trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c

Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Aug  7 00:02:57 2010
@@ -1,3 +1,8 @@
+2010-08-06  Ulrich Drepper  <drepper@xxxxxxxxxx>
+
+	* sysdeps/unix/sysv/linux/getlogin_r.c (__getlogin_r_loginuid):
+	Also fail if tpwd after pwuid call is NULL.
+
 2010-07-31  Samuel Thibault  <samuel.thibault@xxxxxxxxxxxx>
 
 	* hurd/hurdselect.c (_hurd_select): Round timeout up instead of down

Modified: fsf/trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c
==============================================================================
--- fsf/trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c (original)
+++ fsf/trunk/libc/sysdeps/unix/sysv/linux/getlogin_r.c Sat Aug  7 00:02:57 2010
@@ -81,7 +81,7 @@
 	use_malloc = true;
       }
 
-  if (res != 0)
+  if (res != 0 || tpwd == NULL)
     {
       result = -1;
       goto out;