aboutsummaryrefslogtreecommitdiff
path: root/external/unbound/dns64/dns64.c
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2015-12-30 13:21:50 +0200
committerRiccardo Spagni <ric@spagni.net>2015-12-30 13:21:50 +0200
commit91001aa4460a59a42dc14a32c8e90717fd29dbd2 (patch)
tree68da43b847d517870a2f5c92a6ef13167730945c /external/unbound/dns64/dns64.c
parentMerge pull request #577 (diff)
parentfix missing unbound tests (diff)
downloadmonero-91001aa4460a59a42dc14a32c8e90717fd29dbd2.tar.xz
Merge pull request #578
3edbf57 fix missing unbound tests (Riccardo Spagni) 2d43ae8 update unbound, fix unbound openssl issue on OS X (Riccardo Spagni)
Diffstat (limited to 'external/unbound/dns64/dns64.c')
-rw-r--r--external/unbound/dns64/dns64.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/external/unbound/dns64/dns64.c b/external/unbound/dns64/dns64.c
index 63cc8084e..0de3f6643 100644
--- a/external/unbound/dns64/dns64.c
+++ b/external/unbound/dns64/dns64.c
@@ -618,8 +618,10 @@ dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk,
dd->rr_ttl = (time_t*)&dd->rr_data[dd->count];
for(i = 0; i < fd->count; ++i) {
if (fd->rr_len[i] != 6 || fd->rr_data[i][0] != 0
- || fd->rr_data[i][1] != 4)
+ || fd->rr_data[i][1] != 4) {
+ *dd_out = NULL;
return;
+ }
dd->rr_len[i] = 18;
dd->rr_data[i] =
(uint8_t*)&dd->rr_ttl[dd->count] + 18*i;
@@ -638,6 +640,7 @@ dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk,
*/
if(!dk) {
log_err("no key");
+ *dd_out = NULL;
return;
}
@@ -646,6 +649,7 @@ dns64_synth_aaaa_data(const struct ub_packed_rrset_key* fk,
if(!dk->rk.dname) {
log_err("out of memory");
+ *dd_out = NULL;
return;
}