Re: [PATCH] dns_name_length incorrectly returns the length

[Patrik Flykt]

On Wed, 2015-09-09 at 16:51 +0200, Frank Stevers wrote:
> dns_name_length does not account for the terminating \0.

Many thanks for finding and fixing this issue! I added the long
description from your cover letter as the commit message; the change is
now really well documented.

Applied,

Patrik

___
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman

[PATCH] dns_name_length incorrectly returns the length

[Frank Stevers]

dns_name_length does not account for the terminating \0.

Signed-off-by: Frank Stevers 
---
 src/dnsproxy.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/dnsproxy.c b/src/dnsproxy.c
index a1eda55..c37eee9 100644
--- a/src/dnsproxy.c
+++ b/src/dnsproxy.c
@@ -355,7 +355,7 @@ static int dns_name_length(unsigned char *buf)
 {
if ((buf[0] & NS_CMPRSFLGS) == NS_CMPRSFLGS) /* compressed name */
return 2;
-   return strlen((char *)buf);
+   return strlen((char *)buf) + 1;
 }
 
 static void update_cached_ttl(unsigned char *buf, int len, int new_ttl)
@@ -1357,7 +1357,7 @@ static int reply_query_type(unsigned char *msg, int len)
return 0;
 
/* now the query, which is a name and 2 16 bit words */
-   l = dns_name_length(c) + 1;
+   l = dns_name_length(c);
c += l;
type = c[0] << 8 | c[1];
 
-- 
2.1.4

___
connman mailing list
connman@connman.net
https://lists.connman.net/mailman/listinfo/connman