Cypher_Stack/wownero
2
0
Fork 0
mirror of https://git.wownero.com/wownero/wownero.git synced 2024-12-23 02:08:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #159

Browse Source 
7383574 libunbound has const correctness issues... (Thomas Winget)
This commit is contained in:
Riccardo Spagni 2014-09-25 02:17:49 +02:00
commit 5cd77a9f0b
No known key found for this signature in database
GPG Key ID: 55432DF31CCD4FCD
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/common/dns_utils.cpp
View File

@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "common/dns_utils.h" #include "common/dns_utils.h"
#include <cstring>
#include <sstream> #include <sstream>
#include <ldns/rr.h> // for RR type and class defs #include <ldns/rr.h> // for RR type and class defs
#include <unbound.h> #include <unbound.h>
@ -99,9 +100,11 @@ DNSResolver::DNSResolver() : m_data(new DNSResolverData())
// init libunbound context // init libunbound context
m_data->m_ub_context = ub_ctx_create(); m_data->m_ub_context = ub_ctx_create();
char empty_string = '\0';
// look for "/etc/resolv.conf" and "/etc/hosts" or platform equivalent // look for "/etc/resolv.conf" and "/etc/hosts" or platform equivalent
ub_ctx_resolvconf(m_data->m_ub_context, ""); ub_ctx_resolvconf(m_data->m_ub_context, &empty_string);
ub_ctx_hosts(m_data->m_ub_context, ""); ub_ctx_hosts(m_data->m_ub_context, &empty_string);
} }
DNSResolver::~DNSResolver() DNSResolver::~DNSResolver()
@ -119,7 +122,10 @@ DNSResolver::~DNSResolver()
std::vector<std::string> DNSResolver::get_ipv4(const std::string& url) std::vector<std::string> DNSResolver::get_ipv4(const std::string& url)
{ {
std::vector<std::string> addresses; std::vector<std::string> addresses;
char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999);
urlC[999] = '\0';
if (!check_address_syntax(url)) if (!check_address_syntax(url))
{ {
return addresses; return addresses;
@ -129,7 +135,7 @@ std::vector<std::string> DNSResolver::get_ipv4(const std::string& url)
ub_result_ptr result; ub_result_ptr result;
// call DNS resolver, blocking. if return value not zero, something went wrong // call DNS resolver, blocking. if return value not zero, something went wrong
if (!ub_resolve(m_data->m_ub_context, url.c_str(), LDNS_RR_TYPE_A, LDNS_RR_CLASS_IN, &(result.ptr))) if (!ub_resolve(m_data->m_ub_context, urlC, LDNS_RR_TYPE_A, LDNS_RR_CLASS_IN, &(result.ptr)))
{ {
if (result.ptr->havedata) if (result.ptr->havedata)
{ {
@ -146,6 +152,10 @@ std::vector<std::string> DNSResolver::get_ipv4(const std::string& url)
std::vector<std::string> DNSResolver::get_ipv6(const std::string& url) std::vector<std::string> DNSResolver::get_ipv6(const std::string& url)
{ {
std::vector<std::string> addresses; std::vector<std::string> addresses;
char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999);
urlC[999] = '\0';
if (!check_address_syntax(url)) if (!check_address_syntax(url))
{ {
@ -155,7 +165,7 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url)
ub_result_ptr result; ub_result_ptr result;
// call DNS resolver, blocking. if return value not zero, something went wrong // call DNS resolver, blocking. if return value not zero, something went wrong
if (!ub_resolve(m_data->m_ub_context, url.c_str(), LDNS_RR_TYPE_AAAA, LDNS_RR_CLASS_IN, &(result.ptr))) if (!ub_resolve(m_data->m_ub_context, urlC, LDNS_RR_TYPE_AAAA, LDNS_RR_CLASS_IN, &(result.ptr)))
{ {
if (result.ptr->havedata) if (result.ptr->havedata)
{ {
@ -172,6 +182,10 @@ std::vector<std::string> DNSResolver::get_ipv6(const std::string& url)
std::vector<std::string> DNSResolver::get_txt_record(const std::string& url) std::vector<std::string> DNSResolver::get_txt_record(const std::string& url)
{ {
std::vector<std::string> records; std::vector<std::string> records;
char urlC[1000]; // waaaay too big, but just in case...
strncpy(urlC, url.c_str(), 999);
urlC[999] = '\0';
if (!check_address_syntax(url)) if (!check_address_syntax(url))
{ {
@ -181,7 +195,7 @@ std::vector<std::string> DNSResolver::get_txt_record(const std::string& url)
ub_result_ptr result; ub_result_ptr result;
// call DNS resolver, blocking. if return value not zero, something went wrong // call DNS resolver, blocking. if return value not zero, something went wrong
if (!ub_resolve(m_data->m_ub_context, url.c_str(), LDNS_RR_TYPE_TXT, LDNS_RR_CLASS_IN, &(result.ptr))) if (!ub_resolve(m_data->m_ub_context, urlC, LDNS_RR_TYPE_TXT, LDNS_RR_CLASS_IN, &(result.ptr)))
{ {
if (result.ptr->havedata) if (result.ptr->havedata)
{ {