Skip to content

Commit

Permalink
[BZ #305]
Browse files Browse the repository at this point in the history
Update.
2004-12-08  Thorsten Kukuk  <kukuk@suse.de>

	* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
	Add check if the value is not an empty string.  [BZ #305]
  • Loading branch information
Ulrich Drepper committed Dec 10, 2004
1 parent 66ebe46 commit cd8ea5d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 3 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2004-12-08 Thorsten Kukuk <kukuk@suse.de>

* nis/nss_nisplus/nisplus-netgrp.c (_nss_nisplus_getnetgrent_r):
Add check if the value is not an empty string. [BZ #305]

2004-11-29 Jakub Jelinek <jakub@redhat.com>

* stdlib/strtod_l.c (INTERNAL (__STRTOF)): If densize > 2
Expand Down
12 changes: 9 additions & 3 deletions nis/nss_nisplus/nisplus-netgrp.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,

result->type = triple_val;

if (hostlen == 0)
if (hostlen == 0 ||
NISENTRYVAL (result->position, 2,
(nis_result *) result->data)[0] == '\0')
result->val.triple.host = NULL;
else
{
Expand All @@ -99,7 +101,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
*cp++ = '\0';
}

if (userlen == 0)
if (userlen == 0 ||
NISENTRYVAL (result->position, 3,
(nis_result *) result->data)[0] == '\0')
result->val.triple.user = NULL;
else
{
Expand All @@ -110,7 +114,9 @@ _nss_nisplus_getnetgrent_r (struct __netgrent *result, char *buffer,
*cp++ = '\0';
}

if (domainlen == 0)
if (domainlen == 0 ||
NISENTRYVAL (result->position, 4,
(nis_result *) result->data)[0] == '\0')
result->val.triple.domain = NULL;
else
{
Expand Down

0 comments on commit cd8ea5d

Please sign in to comment.