diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | nis/nss_nisplus/nisplus-parser.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 056d3c4a43..eb1c35feb5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2018-06-27 Maciej W. Rozycki <macro@mips.com> + + [BZ #23266] + * nis/nss_nisplus/nisplus-parser.c (_nss_nisplus_parse_pwent): + Copy and null-terminate entries that are not terminated, in + addition to empty ones. + 2018-06-27 Florian Weimer <fweimer@redhat.com> [BZ #18023] diff --git a/nis/nss_nisplus/nisplus-parser.c b/nis/nss_nisplus/nisplus-parser.c index 8dc021e73d..d2b06334c2 100644 --- a/nis/nss_nisplus/nisplus-parser.c +++ b/nis/nss_nisplus/nisplus-parser.c @@ -82,7 +82,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, char *numstr = NISOBJVAL (2, obj); len = NISOBJLEN (2, obj); - if (len == 0 && numstr[len - 1] != '\0') + if (len == 0 || numstr[len - 1] != '\0') { if (len >= room_left) goto no_more_room; @@ -98,7 +98,7 @@ _nss_nisplus_parse_pwent (nis_result *result, struct passwd *pw, numstr = NISOBJVAL (3, obj); len = NISOBJLEN (3, obj); - if (len == 0 && numstr[len - 1] != '\0') + if (len == 0 || numstr[len - 1] != '\0') { if (len >= room_left) goto no_more_room; |