aboutsummaryrefslogtreecommitdiff
path: root/nscd/nscd_gethst_r.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-11-10 07:50:03 +0000
committerUlrich Drepper <drepper@redhat.com>2004-11-10 07:50:03 +0000
commit5429ff760a5544a34c5f05f16c01a7dffa505604 (patch)
treeff81df09d20cae4092329dc25a3ed32fe7c0fc66 /nscd/nscd_gethst_r.c
parent81b5ae0811c4da3701d08afa07a9b9159aac56e5 (diff)
downloadglibc-5429ff760a5544a34c5f05f16c01a7dffa505604.tar
glibc-5429ff760a5544a34c5f05f16c01a7dffa505604.tar.gz
glibc-5429ff760a5544a34c5f05f16c01a7dffa505604.tar.bz2
glibc-5429ff760a5544a34c5f05f16c01a7dffa505604.zip
(libc_locked_map_ptr): Add new first parameter, used as class for definition.
* nscd/nscd-client.h (libc_locked_map_ptr): Add new first parameter, used as class for definition. * nscd/nscd_getpw_r.c: Adjust for libc_locked_map_ptr change. (pw_map_free): Ensure no crash after memory is freed. * nscd/nscd_getgr.c: Likewise. Make map externally visible. * nscd/nscd_gethst.c: Likewise. * nscd/nscd_getai.c: Use map from nscd_gethost.c. * nscd/nscd_initgroups.c: Use map from nscd_getgr.c.
Diffstat (limited to 'nscd/nscd_gethst_r.c')
-rw-r--r--nscd/nscd_gethst_r.c10
1 files changed, 10 insertions, 0 deletions
diff --git a/nscd/nscd_gethst_r.c b/nscd/nscd_gethst_r.c
index 407be1441f..64d02fedc7 100644
--- a/nscd/nscd_gethst_r.c
+++ b/nscd/nscd_gethst_r.c
@@ -336,6 +336,16 @@ nscd_gethst_r (const char *key, size_t keylen, request_type type,
memcpy (resultbuf->h_aliases[0],
(const char *) addr_list + addr_list_len, total_len);
+ /* Try to detect corrupt databases. */
+ if (resultbuf->h_name[hst_resp->h_name_len - 1] != '\0'
+ || ({for (cnt = 0; cnt < hst_resp->h_aliases_cnt; ++cnt)
+ if (resultbuf->h_aliases[cnt][aliases_len[cnt] - 1]
+ != '\0')
+ break;
+ cnt < hst_resp->h_aliases_cnt; }))
+ /* We cannot use the database. */
+ goto out_close;
+
retval = 0;
*result = resultbuf;
}