WEBDIENSTE/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2026-09-11 12:27:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix memory alloc bug for the testcase and c89 style

Browse Source
This commit is contained in:
TCY16
2022-06-17 15:52:45 +02:00
parent 69411ff125
commit a5ca3850aa
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
testcode/testpkts.c
+20 -9
View File
@@ -1778,22 +1778,32 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
if(match->server_cookie) {
/** Find the cookie option and add the server cookie if
* the client cookie is present and not already there */
res = realloc(res, reslen + 28);
uint8_t* walk_query = query_pkt;
size_t walk_query_len = query_len;
uint8_t* walk_response = res;
size_t walk_response_len = reslen;
size_t walk_response_len = reslen+28;
uint8_t* rdlen_ptr_query;
uint8_t* rdlen_ptr_response;
reslen += 28;
if (!(walk_response)) {
log_err("testbound: out of memory; send without cookie");
return;
}
/* verify that we have a EDNS record */
if(!pkt_find_edns_opt(&walk_query, &walk_query_len)) {
walk_query_len = 0;
log_err("testbound: no EDNS in the query packet when trying to attach a EDNS cookie");
log_err("testbound: no EDNS in the query packet when "
"trying to attach a EDNS cookie");
}
if(!pkt_find_edns_opt(&walk_response, &walk_response_len)) {
walk_response_len = 0;
log_err("testbound: no EDNS in the response packet when trying to attach a EDNS cookie");
log_err("testbound: no EDNS in the response packet when"
"trying to attach a EDNS cookie");
}
/* verify that we have a EDNS option */
@@ -1832,11 +1842,15 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
log_err("testbound: invalid EDNS cookie in the query packet");
}
if (walk_query_len > 0 && walk_response_len == 0) {
if (walk_query_len > 0 && walk_response_len > 0) {
/* create space for the cookie, as the length of the
* rest of the response is 0 */
/* depending on the incoming cookie, add the server cookie
* or copy the complete cookie to the response */
if (sldns_read_uint16(walk_query+2) == 8) {
/* copy the EDNS client cookie from the query packet to the response */
/* copy the EDNS client cookie from the query
* packet to the response */
memcpy(walk_response, walk_query, 12);
/* add the server cookie to the client cookie to make it
@@ -1859,15 +1873,12 @@ adjust_packet(struct entry* match, uint8_t** answer_pkt, size_t *answer_len,
memcpy(rdlen_ptr_response, rdlen_ptr_query, 12);
memcpy(walk_response+12, rdlen_ptr_query+12+8, 8);
memcpy(walk_response+12+8, rdlen_ptr_query+12, 8);
reslen = origlen + 28;
} else {
memcpy(rdlen_ptr_response, rdlen_ptr_query, 28);
reslen = origlen + 28;
}
} else {
log_err("testbound: the incoming EDNS cookie has the wrong length");
}
} else {
log_err("testbound: an error has occured while parsing the EDNS cookie");