From: David Goulet <dgoulet@efficios.com>
Date: Tue, 14 Aug 2012 21:14:04 +0000 (-0400)
Subject: Fix: Possible invalid read on string in set_ip_address()
X-Git-Tag: v2.1.0-rc1~21
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=13083fa6d2130b0e2c4f5bb03c90b99d44564408;ds=sidebyside

Fix: Possible invalid read on string in set_ip_address()

Acked-by: Christian Babeux <christian.babeux@efficios.com>
Signed-off-by: David Goulet <dgoulet@efficios.com>
---

diff --git a/src/common/uri.c b/src/common/uri.c
index 3581e307d..e686f7c5d 100644
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#include <assert.h>
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <stdlib.h>
@@ -103,6 +104,11 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
 	unsigned char buf[sizeof(struct in6_addr)];
 	struct hostent *record;
 
+	assert(addr);
+	assert(dst);
+
+	memset(dst, 0, size);
+
 	/* Network protocol */
 	ret = inet_pton(af, addr, buf);
 	if (ret < 1) {
@@ -117,7 +123,10 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
 		/* Translate IP to string */
 		(void) inet_ntop(af, record->h_addr_list[0], dst, size);
 	} else {
-		memcpy(dst, addr, size);
+		if (size > 0) {
+			strncpy(dst, addr, size);
+			dst[size - 1] = '\0';
+		}
 	}
 
 	DBG2("IP address resolved to %s", dst);