From 4e7bd2e5cfa1db824d28c20c7f264e5594004e0e Mon Sep 17 00:00:00 2001 From: Melinda Shore Date: Mon, 13 Jan 2014 14:07:30 -0800 Subject: [PATCH 1/2] fixed typo in argument to ldns_str2rdf_dname() --- src/convert.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/convert.c b/src/convert.c index 09a2cd90..6cb7b9c4 100644 --- a/src/convert.c +++ b/src/convert.c @@ -70,7 +70,7 @@ getdns_convert_dns_name_to_fqdn(char *name_from_dns_response) char * getdns_convert_fqdn_to_dns_name(char *fqdn_as_string) { - ldns *rdf; + ldns_rdf *rdf; char *data; if (ldns_str2rdf_dname(&rdf, fqdn_as_string) != LDNS_STATUS_OK) return NULL; From 4866a4314af10b1d22b53dec8d531667ef7e1da5 Mon Sep 17 00:00:00 2001 From: Melinda Shore Date: Mon, 13 Jan 2014 14:11:28 -0800 Subject: [PATCH 2/2] Added check for null being passed to convert_ulabel_to_alabel() and convert_alabel_to_ulabel() --- src/convert.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/convert.c b/src/convert.c index 6cb7b9c4..b3a17908 100644 --- a/src/convert.c +++ b/src/convert.c @@ -97,6 +97,8 @@ getdns_convert_ulabel_to_alabel(char *ulabel) char *buf; char *prepped; + if (ulabel == NULL) + return 0; setlocale(LC_ALL, ""); if ((prepped = stringprep_locale_to_utf8(ulabel)) == 0) return 0; @@ -125,6 +127,8 @@ getdns_convert_alabel_to_ulabel(char *alabel) int ret; /* just in case we might want to use it someday */ char *buf; + if (alabel == NULL) + return 0; if ((ret = idna_to_unicode_8z8z(alabel, &buf, 0)) != IDNA_SUCCESS) { return NULL; }