aboutsummaryrefslogtreecommitdiff
path: root/nscd/hstcache.c
diff options
context:
space:
mode:
authorAnders Johansson <ajohansson@novell.com>2009-10-29 22:18:26 -0700
committerUlrich Drepper <drepper@redhat.com>2009-10-29 22:18:26 -0700
commitea547a1a6e350b758fcda76b919b3aa774752318 (patch)
treed78a3f57c05349de4f423eb36cef97f08f83bc77 /nscd/hstcache.c
parent5c53736b52d5032171813d813d4a7ad505102b61 (diff)
downloadglibc-ea547a1a6e350b758fcda76b919b3aa774752318.zip
glibc-ea547a1a6e350b758fcda76b919b3aa774752318.tar.gz
glibc-ea547a1a6e350b758fcda76b919b3aa774752318.tar.bz2
Fix a few asserts and IO calls in nscd.
The nscd/*cache.c files contain assert()s, writeall() and sendfileall() calls that invalidly use together &dataset->resp and total where either dataset or dataset->head.recsize should be used instead one of the components. In the writeall() and sendfileall() cases, it is unlikely to matter in practice, but the assertions can fail sometimes without a proper reason.
Diffstat (limited to 'nscd/hstcache.c')
-rw-r--r--nscd/hstcache.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/nscd/hstcache.c b/nscd/hstcache.c
index 51e2273..228f6fd 100644
--- a/nscd/hstcache.c
+++ b/nscd/hstcache.c
@@ -337,7 +337,7 @@ cache_addhst (struct database_dyn *db, int fd, request_header *req,
{
assert (db->wr_fd != -1);
assert ((char *) &dataset->resp > (char *) db->data);
- assert ((char *) &dataset->resp - (char *) db->head
+ assert ((char *) dataset - (char *) db->head
+ total
<= (sizeof (struct database_pers_head)
+ db->head->module * sizeof (ref_t)