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:53:11 +0100 |
| commit | e283e1d04c3c345dd594e03daa868e86ebf1656a (patch) | |
| tree | 7fd5c5c02352a1c0d61ff53ae6a5c2d4e888ff5d | |
| parent | 9f94d2ea71aaf73f964f8c1de5da85df94ef25bb (diff) | |
| download | glibc-e283e1d04c3c345dd594e03daa868e86ebf1656a.tar.gz glibc-e283e1d04c3c345dd594e03daa868e86ebf1656a.tar.xz glibc-e283e1d04c3c345dd594e03daa868e86ebf1656a.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 0dad46bace..24506f0d07 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. + 2011-01-19 Ulrich Drepper <drepper@gmail.com> [BZ #11724] 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; |