mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-07 13:28:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

* nis/nss_nisplus/nisplus-parser.c: Minor optimizations and

Browse Source 
cleanups.  Avoid copying data if it can be used in the old place.
This commit is contained in:
Ulrich Drepper 2006-04-30 07:01:26 +00:00
parent 487609e313
commit ac05397075
2 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-30 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nisplus/nisplus-parser.c: Minor optimizations and
cleanups. Avoid copying data if it can be used in the old place.
2006-04-29 Ulrich Drepper <drepper@redhat.com> 2006-04-29 Ulrich Drepper <drepper@redhat.com>
* nis/nss_nisplus/nisplus-ethers.c: Add missing null pointer check. * nis/nss_nisplus/nisplus-ethers.c: Add missing null pointer check.

83
nis/nss_nisplus/nisplus-parser.c
View File

@ -84,27 +84,37 @@ _nss_nisplus_parse_pwent (nis_result *result, size_t entry, struct passwd *pw,
room_left -= len + 1; room_left -= len + 1;
first_unused += len + 1; first_unused += len + 1;
if (NISENTRYLEN (entry, 2, result) >= room_left) char *numstr = NISENTRYVAL (entry, 2, result);
goto no_more_room; len = NISENTRYLEN (entry, 2, result);
if (len == 0 && numstr[len - 1] != '\0')
{
if (len >= room_left)
goto no_more_room;
strncpy (first_unused, NISENTRYVAL (entry, 2, result), strncpy (first_unused, numstr, len);
NISENTRYLEN (entry, 2, result)); first_unused[len] = '\0';
first_unused[NISENTRYLEN (entry, 2, result)] = '\0'; numstr = first_unused;
len = strlen (first_unused); }
if (len == 0) /* If we don't have a uid, it's an invalid shadow entry */ if (numstr[0] == '\0')
/* If we don't have a uid, it's an invalid shadow entry. */
return 0; return 0;
pw->pw_uid = strtoul (first_unused, NULL, 10); pw->pw_uid = strtoul (numstr, NULL, 10);
if (NISENTRYLEN (entry, 3, result) >= room_left) numstr = NISENTRYVAL (entry, 3, result);
goto no_more_room; len = NISENTRYLEN (entry, 3, result);
if (len == 0 && numstr[len - 1] != '\0')
{
if (len >= room_left)
goto no_more_room;
strncpy (first_unused, NISENTRYVAL (entry, 3, result), strncpy (first_unused, numstr, len);
NISENTRYLEN (entry, 3, result)); first_unused[len] = '\0';
first_unused[NISENTRYLEN (entry, 3, result)] = '\0'; numstr = first_unused;
len = strlen (first_unused); }
if (len == 0) /* If we don't have a gid, it's an invalid shadow entry */ if (numstr[0] == '\0')
/* If we don't have a gid, it's an invalid shadow entry. */
return 0; return 0;
pw->pw_gid = strtoul (first_unused, NULL, 10); pw->pw_gid = strtoul (numstr, NULL, 10);
if (NISENTRYLEN(entry, 4, result) >= room_left) if (NISENTRYLEN(entry, 4, result) >= room_left)
goto no_more_room; goto no_more_room;
@ -178,8 +188,8 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr,
if (len == 0) /* group table is corrupt */ if (len == 0) /* group table is corrupt */
return 0; return 0;
gr->gr_name = first_unused; gr->gr_name = first_unused;
room_left -= (len + 1); room_left -= len + 1;
first_unused += (len + 1); first_unused += len + 1;
if (NISENTRYLEN (entry, 1, result) >= room_left) if (NISENTRYLEN (entry, 1, result) >= room_left)
goto no_more_room; goto no_more_room;
@ -189,19 +199,24 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr,
first_unused[NISENTRYLEN (entry, 1, result)] = '\0'; first_unused[NISENTRYLEN (entry, 1, result)] = '\0';
gr->gr_passwd = first_unused; gr->gr_passwd = first_unused;
len = strlen (first_unused); len = strlen (first_unused);
room_left -= (len + 1); room_left -= len + 1;
first_unused += (len + 1); first_unused += len + 1;
if (NISENTRYLEN (entry, 2, result) >= room_left) char *numstr = NISENTRYVAL (entry, 2, result);
goto no_more_room; len = NISENTRYLEN (entry, 2, result);
if (len == 0 && numstr[len - 1] != '\0')
{
if (len >= room_left)
goto no_more_room;
strncpy (first_unused, NISENTRYVAL (entry, 2, result), strncpy (first_unused, numstr, len);
NISENTRYLEN (entry, 2, result)); first_unused[len] = '\0';
first_unused[NISENTRYLEN (entry, 2, result)] = '\0'; numstr = first_unused;
len = strlen (first_unused); }
if (len == 0) /* We should always have a gid */ if (numstr[0] == '\0')
/* We should always have a gid. */
return 0; return 0;
gr->gr_gid = strtoul (first_unused, NULL, 10); gr->gr_gid = strtoul (numstr, NULL, 10);
if (NISENTRYLEN (entry, 3, result) >= room_left) if (NISENTRYLEN (entry, 3, result) >= room_left)
goto no_more_room; goto no_more_room;
@ -211,8 +226,8 @@ _nss_nisplus_parse_grent (nis_result *result, u_long entry, struct group *gr,
first_unused[NISENTRYLEN (entry, 3, result)] = '\0'; first_unused[NISENTRYLEN (entry, 3, result)] = '\0';
line = first_unused; line = first_unused;
len = strlen (line); len = strlen (line);
room_left -= (len + 1); room_left -= len + 1;
first_unused += (len + 1); first_unused += len + 1;
/* Adjust the pointer so it is aligned for /* Adjust the pointer so it is aligned for
storing pointers. */ storing pointers. */
size_t adjust = ((__alignof__ (char *) size_t adjust = ((__alignof__ (char *)
@ -294,8 +309,8 @@ _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp,
if (len == 0) if (len == 0)
return 0; return 0;
sp->sp_namp = first_unused; sp->sp_namp = first_unused;
room_left -= (len + 1); room_left -= len + 1;
first_unused += (len + 1); first_unused += len + 1;
if (NISENTRYLEN (0, 1, result) >= room_left) if (NISENTRYLEN (0, 1, result) >= room_left)
goto no_more_room; goto no_more_room;
@ -305,8 +320,8 @@ _nss_nisplus_parse_spent (nis_result *result, struct spwd *sp,
first_unused[NISENTRYLEN (0, 1, result)] = '\0'; first_unused[NISENTRYLEN (0, 1, result)] = '\0';
sp->sp_pwdp = first_unused; sp->sp_pwdp = first_unused;
len = strlen (first_unused); len = strlen (first_unused);
room_left -= (len + 1); room_left -= len + 1;
first_unused += (len + 1); first_unused += len + 1;
sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact = sp->sp_lstchg = sp->sp_min = sp->sp_max = sp->sp_warn = sp->sp_inact =
sp->sp_expire = -1; sp->sp_expire = -1;