sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-29 13:49:30 +03:00
Code Activity

s4-dns: Add some NULL checks to create_response_rr

Browse Source 
Signed-off-by: Kai Blin <kai@samba.org>
This commit is contained in:
Volker Lendecke
2012-05-24 14:57:11 +02:00
committed by Kai Blin
parent 40e47d08af
commit 1bbdf224bb
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
source4/dns_server/dns_query.c
View File

@ -47,9 +47,15 @@ static WERROR create_response_rr(const struct dns_name_question *question,
switch (rec->wType) { switch (rec->wType) {
case DNS_QTYPE_CNAME: case DNS_QTYPE_CNAME:
ans[ai].rdata.cname_record = talloc_strdup(ans, rec->data.cname); ans[ai].rdata.cname_record = talloc_strdup(ans, rec->data.cname);
if (ans[ai].rdata.cname_record == NULL) {
return WERR_NOMEM;
}
break; break;
case DNS_QTYPE_A: case DNS_QTYPE_A:
ans[ai].rdata.ipv4_record = talloc_strdup(ans, rec->data.ipv4); ans[ai].rdata.ipv4_record = talloc_strdup(ans, rec->data.ipv4);
if (ans[ai].rdata.ipv4_record == NULL) {
return WERR_NOMEM;
}
break; break;
case DNS_QTYPE_AAAA: case DNS_QTYPE_AAAA:
ans[ai].rdata.ipv6_record = rec->data.ipv6; ans[ai].rdata.ipv6_record = rec->data.ipv6;
@ -77,9 +83,15 @@ static WERROR create_response_rr(const struct dns_name_question *question,
break; break;
case DNS_QTYPE_TXT: case DNS_QTYPE_TXT:
tmp = talloc_asprintf(ans, "\"%s\"", rec->data.txt.str[0]); tmp = talloc_asprintf(ans, "\"%s\"", rec->data.txt.str[0]);
if (tmp == NULL) {
return WERR_NOMEM;
}
for (i=1; i<rec->data.txt.count; i++) { for (i=1; i<rec->data.txt.count; i++) {
tmp = talloc_asprintf_append(tmp, " \"%s\"", tmp = talloc_asprintf_append(tmp, " \"%s\"",
rec->data.txt.str[i]); rec->data.txt.str[i]);
if (tmp == NULL) {
return WERR_NOMEM;
}
} }
ans[ai].rdata.txt_record.txt = tmp; ans[ai].rdata.txt_record.txt = tmp;
break; break;
@ -89,6 +101,9 @@ static WERROR create_response_rr(const struct dns_name_question *question,
} }
ans[ai].name = talloc_strdup(ans, question->name); ans[ai].name = talloc_strdup(ans, question->name);
if (ans[ai].name == NULL) {
return WERR_NOMEM;
}
ans[ai].rr_type = rec->wType; ans[ai].rr_type = rec->wType;
ans[ai].rr_class = DNS_QCLASS_IN; ans[ai].rr_class = DNS_QCLASS_IN;
ans[ai].ttl = rec->dwTtlSeconds; ans[ai].ttl = rec->dwTtlSeconds;