about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-05-01 22:25:23 +0000
committerUlrich Drepper <drepper@redhat.com>2006-05-01 22:25:23 +0000
commitd4b661e5757ca4059d875173ae70328fb31f1595 (patch)
treedc6d6dc6ebe6df2830ab139cb5f1fd57205e0bc5
parent96c169f22ea4d400f6ec5f540bbe16f2822e8279 (diff)
downloadglibc-d4b661e5757ca4059d875173ae70328fb31f1595.tar.gz
glibc-d4b661e5757ca4059d875173ae70328fb31f1595.tar.xz
glibc-d4b661e5757ca4059d875173ae70328fb31f1595.zip
* 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].
-rw-r--r--ChangeLog3
-rw-r--r--nis/nss_nis/nis-grp.c3
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 549d729cc2..b5efea9dad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2006-05-01  Ulrich Drepper  <drepper@redhat.com>
 
+	* 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].
+
 	[BZ #2517]
 	* misc/sys/queue.h: Update to more recent version.
 
diff --git a/nis/nss_nis/nis-grp.c b/nis/nss_nis/nis-grp.c
index ce642c484f..6e36cf828f 100644
--- a/nis/nss_nis/nis-grp.c
+++ b/nis/nss_nis/nis-grp.c
@@ -220,7 +220,8 @@ internal_nis_getgrent_r (struct group *grp, 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;
 	}