aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-01 22:33:24 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-01 22:33:24 +0000
commit1e528c6e1bd9d6c7d952456eab826362f489dfbd (patch)
tree15e71e08ffc7b7179b3b275e599595864818adc8
parentd4b661e5757ca4059d875173ae70328fb31f1595 (diff)
downloadglibc-1e528c6e1bd9d6c7d952456eab826362f489dfbd.zip
glibc-1e528c6e1bd9d6c7d952456eab826362f489dfbd.tar.gz
glibc-1e528c6e1bd9d6c7d952456eab826362f489dfbd.tar.bz2
* nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r): Don't try to
free outkey in error case when batch_read is set.
-rw-r--r--ChangeLog3
-rw-r--r--NEWS6
-rw-r--r--nis/nss_nis/nis-pwd.c3
3 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b5efea9..5902e54 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2006-05-01 Ulrich Drepper <drepper@redhat.com>
+ * nis/nss_nis/nis-pwd.c (internal_nis_getpwent_r): Don't try to
+ free outkey in error case when batch_read is set.
+
* nis/nss_nis/nis-grp.c (internal_nis_getgrent_r): Don't try to
free outkey in error case when batch_read is set [Coverity CID 196].
diff --git a/NEWS b/NEWS
index eff3b48..2a9ac22 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-GNU C Library NEWS -- history of user-visible changes. 2006-04-16
+GNU C Library NEWS -- history of user-visible changes. 2006-05-01
Copyright (C) 1992-2002,2003,2004,2005,2006 Free Software Foundation, Inc.
See the end for copying conditions.
@@ -10,7 +10,9 @@ Version 2.5
* For Linux, the sorting of addresses returned by getaddrinfo now also
handles rules 3 and 7 from RFC 3484. Implemented by Ulrich Drepper.
-* New Linux interfaces: splice, tee, sync_file_range.
+* New Linux interfaces: splice, tee, sync_file_range, vmsplace.
+
+* New iconv module for MIK. Contributed by Alexander Shopov.
Version 2.4
diff --git a/nis/nss_nis/nis-pwd.c b/nis/nss_nis/nis-pwd.c
index 7972118..1b5206a 100644
--- a/nis/nss_nis/nis-pwd.c
+++ b/nis/nss_nis/nis-pwd.c
@@ -333,7 +333,8 @@ internal_nis_getpwent_r (struct passwd *pwd, char *buffer, size_t buflen,
errnop);
if (__builtin_expect (parse_res == -1, 0))
{
- free (outkey);
+ if (!batch_read)
+ free (outkey);
*errnop = ERANGE;
return NSS_STATUS_TRYAGAIN;
}