aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-02-02 08:59:04 -0500
committerUlrich Drepper <drepper@gmail.com>2011-02-02 08:59:04 -0500
commit10a656fe33d8257531ff3e9a882d3fd7db6ce5b3 (patch)
tree17896a4effe387261a092676c2fc12aa9c1f6b06
parent3321010338384ecdc6633a8b032bb0ed6aa9b19a (diff)
downloadglibc-10a656fe33d8257531ff3e9a882d3fd7db6ce5b3.zip
glibc-10a656fe33d8257531ff3e9a882d3fd7db6ce5b3.tar.gz
glibc-10a656fe33d8257531ff3e9a882d3fd7db6ce5b3.tar.bz2
Fix range error handling in sgetspent.
-rw-r--r--ChangeLog5
-rw-r--r--shadow/sgetspent.c6
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 0dad46b..24506f0 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 ec7f384..f3dce53 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;