mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-30 14:07:59 +00:00
Code Issues Releases Wiki Activity

set the used region before parsing. Gotta love buffers, they'll keep ya honest

Browse Source
This commit is contained in:
Michael Graff
2000-01-26 22:22:41 +00:00
parent 77d886b04e
commit f1092e671a
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/lwres/lwres_gabn.c
View File

@@ -83,7 +83,8 @@ lwres_gabnrequest_render(lwres_context_t *ctx, lwres_gabnrequest_t *req,
* just checked for it. * just checked for it.
*/ */
lwres_buffer_putuint16(b, datalen); lwres_buffer_putuint16(b, datalen);
lwres_buffer_putmem(b, req->name, datalen + 1); /* trailing NUL */ lwres_buffer_putmem(b, req->name, datalen);
lwres_buffer_putuint8(b, 0); /* trailing NUL */
INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0); INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0);
@@ -149,14 +150,16 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
datalen = req->realnamelen; datalen = req->realnamelen;
INSIST(SPACE_OK(b, (unsigned int)(datalen + 2 + 1))); INSIST(SPACE_OK(b, (unsigned int)(datalen + 2 + 1)));
lwres_buffer_putuint16(b, datalen); lwres_buffer_putuint16(b, datalen);
lwres_buffer_putmem(b, req->realname, datalen + 1); lwres_buffer_putmem(b, req->realname, datalen);
lwres_buffer_putuint8(b, 0);
/* encode the aliases */ /* encode the aliases */
for (x = 0 ; x < req->naliases ; x++) { for (x = 0 ; x < req->naliases ; x++) {
datalen = req->aliaslen[x]; datalen = req->aliaslen[x];
INSIST(SPACE_OK(b, (unsigned int)(datalen + 2 + 1))); INSIST(SPACE_OK(b, (unsigned int)(datalen + 2 + 1)));
lwres_buffer_putuint16(b, datalen); lwres_buffer_putuint16(b, datalen);
lwres_buffer_putmem(b, req->aliases[x], datalen + 1); lwres_buffer_putmem(b, req->aliases[x], datalen);
lwres_buffer_putuint8(b, 0);
} }
/* encode the addresses */ /* encode the addresses */
@@ -171,6 +174,7 @@ lwres_gabnresponse_render(lwres_context_t *ctx, lwres_gabnresponse_t *req,
} }
INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0); INSIST(LWRES_BUFFER_AVAILABLECOUNT(b) == 0);
INSIST(b->used == pkt->length);
return (LWRES_R_SUCCESS); return (LWRES_R_SUCCESS);
} }

2
lib/lwres/lwresutil.c
View File

@@ -145,6 +145,7 @@ lwres_getaddrsbyname(lwres_context_t *ctx, const char *name,
goto out; goto out;
lwres_buffer_init(&b_in, buffer, recvlen); lwres_buffer_init(&b_in, buffer, recvlen);
b_in.used = recvlen;
/* /*
* Parse the packet header. * Parse the packet header.
@@ -252,6 +253,7 @@ lwres_getnamebyaddr(lwres_context_t *ctx, isc_uint32_t addrtype,
goto out; goto out;
lwres_buffer_init(&b_in, buffer, recvlen); lwres_buffer_init(&b_in, buffer, recvlen);
b_in.used = recvlen;
/* /*
* Parse the packet header. * Parse the packet header.