diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | nss/nss_db/db-XXX.c | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 2989d21940..32bef3340e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2016-06-11 Florian Weimer <fweimer@redhat.com> + [BZ #20237] + * nss/nss_db/db-XXX.c (set*ent): Reset entidx to NULL. + (get*ent): Set entidx to NULL during initialization. If entidx is + NULL, start iteration from the beginning. + +2016-06-11 Florian Weimer <fweimer@redhat.com> + * malloc/malloc.c (musable): Return correct size for dumped fake mmapped chunk. diff --git a/nss/nss_db/db-XXX.c b/nss/nss_db/db-XXX.c index 125a5e9b12..2d13edda27 100644 --- a/nss/nss_db/db-XXX.c +++ b/nss/nss_db/db-XXX.c @@ -77,7 +77,7 @@ CONCAT(_nss_db_set,ENTNAME) (int stayopen) keep_db |= stayopen; /* Reset the sequential index. */ - entidx = (const char *) state.header + state.header->valstroffset; + entidx = NULL; } __libc_lock_unlock (lock); @@ -253,8 +253,14 @@ CONCAT(_nss_db_get,ENTNAME_r) (struct STRUCTURE *result, char *buffer, H_ERRNO_SET (NETDB_INTERNAL); goto out; } + entidx = NULL; } + /* Start from the beginning if freshly initialized or reset + requested by set*ent. */ + if (entidx == NULL) + entidx = (const char *) state.header + state.header->valstroffset; + status = NSS_STATUS_UNAVAIL; if (state.header != MAP_FAILED) { |