From: Martin Willi <martin@strongswan.org>
Date: Wed, 3 Jan 2007 09:25:57 +0000 (-0000)
Subject: fixed host conversion length check
X-Git-Tag: 4.0.6~33
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=60d79e496b98b16c6312f8e616ae23fda76eeeb7;p=thirdparty%2Fstrongswan.git

fixed host conversion length check
---

diff --git a/src/charon/threads/kernel_interface.c b/src/charon/threads/kernel_interface.c
index 074e7fcc8f..3ec2bd58e8 100644
--- a/src/charon/threads/kernel_interface.c
+++ b/src/charon/threads/kernel_interface.c
@@ -428,7 +428,7 @@ static void receive_messages(private_kernel_interface_t *this)
 static void host2xfrm(host_t *host, xfrm_address_t *xfrm)
 {
 	chunk_t chunk = host->get_address(host);
-	memcpy(xfrm, chunk.ptr, max(chunk.len, sizeof(xfrm_address_t)));	
+	memcpy(xfrm, chunk.ptr, min(chunk.len, sizeof(xfrm_address_t)));	
 }
 
 /**
@@ -631,7 +631,7 @@ static status_t add_sa(private_kernel_interface_t *this,
 		
 		rthdr = XFRM_RTA_NEXT(rthdr);
 	}
-
+	
 	if (send_message(this, hdr, &response) != SUCCESS)
 	{
 		DBG1(DBG_KNL, "netlink communication failed");