aboutsummaryrefslogtreecommitdiff
path: root/net/dns_resolver
diff options
context:
space:
mode:
authorAlex Shi <alex.shi@linaro.org>2014-07-29 13:55:15 +0800
committerAlex Shi <alex.shi@linaro.org>2014-07-29 13:55:15 +0800
commit7c18f677c1a7a94efc845ecedde2f1d1463d4359 (patch)
treee6841fbec6073f2c068fa6aec1f477964d34e198 /net/dns_resolver
parent1df5f2728eb1ba0f7b783c00afe7575902996d39 (diff)
parent77917ecac9c37f9f02e7954b617df8f824894778 (diff)
downloadjuno-master.tar.gz
Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-androidHEADmaster
Diffstat (limited to 'net/dns_resolver')
-rw-r--r--net/dns_resolver/dns_query.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/net/dns_resolver/dns_query.c b/net/dns_resolver/dns_query.c
index c32be292c7e..2022b46ab38 100644
--- a/net/dns_resolver/dns_query.c
+++ b/net/dns_resolver/dns_query.c
@@ -150,7 +150,9 @@ int dns_query(const char *type, const char *name, size_t namelen,
if (!*_result)
goto put;
- memcpy(*_result, upayload->data, len + 1);
+ memcpy(*_result, upayload->data, len);
+ (*_result)[len] = '\0';
+
if (_expiry)
*_expiry = rkey->expiry;