diff options
| author | Andreas Schwab <schwab@redhat.com> | 2011-02-02 08:59:04 -0500 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2011-02-04 00:02:35 +0100 |
| commit | b472343aa6febfb469b1022b4cf56d519ab30022 (patch) | |
| tree | f7e1fd39938d0b7f15dfebee62f2f9fb9416e55a | |
| parent | 997c2a72c1238144e2377c92f2da207cb188f7aa (diff) | |
| download | glibc-b472343aa6febfb469b1022b4cf56d519ab30022.tar.gz glibc-b472343aa6febfb469b1022b4cf56d519ab30022.tar.xz glibc-b472343aa6febfb469b1022b4cf56d519ab30022.zip | |
Fix range error handling in sgetspent.
(cherry picked from commit 10a656fe33d8257531ff3e9a882d3fd7db6ce5b3)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | shadow/sgetspent.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index b4dcd7f0e4..6f3a19b118 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2011-02-02 Andreas Schwab <schwab@redhat.com> + + * shadow/sgetspent.c: Check return value of __sgetspent_r instead + of errno. + 2010-10-01 Andreas Schwab <schwab@redhat.com> * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of diff --git a/shadow/sgetspent.c b/shadow/sgetspent.c index ec7f384fa6..f3dce53ea3 100644 --- a/shadow/sgetspent.c +++ b/shadow/sgetspent.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996, 1997, 2011 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -49,8 +49,8 @@ sgetspent (const char *string) } while (buffer != NULL - && __sgetspent_r (string, &resbuf, buffer, buffer_size, &result) != 0 - && errno == ERANGE) + && (__sgetspent_r (string, &resbuf, buffer, buffer_size, &result) + == ERANGE)) { char *new_buf; buffer_size += BUFLEN_SPWD; |