Fixes to r6925.

git-svn-id: http://svn.openvpn.net/projects/openvpn/branches/BETA21/openvpn@6927 e7ae566f-a301-0410-adde-c780ea21d3b5

diff --git a/route.c b/route.c
index 711f7f95da85e3420f6543e84111a05b66c7468a..c3e4acfecdfe380042e123ccfb52c3e776c0c6f8 100644 (file)
--- a/route.c
+++ b/route.c
@@ -1800,7 +1800,7 @@ struct rtmsg {
 };
 
 #define ROUNDUP(a) \
-        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(long) - 1))) : sizeof(long))
+        ((a) > 0 ? (1 + (((a) - 1) | (sizeof(uint32_t) - 1))) : sizeof(uint32_t))
 
 static bool
 get_default_gateway_ex (in_addr_t *ret, in_addr_t *netmask, char **ifname)
@@ -2359,7 +2359,7 @@ get_default_gateway_mac_addr (unsigned char *macaddr)
       goto done;
     }
 
-  buffer = (char *) gc_malloc (bufsize, false, &gc);
+  buffer = (char *) gc_malloc (bufsize, true, &gc);
 
   sockfd = socket(AF_INET, SOCK_DGRAM, 0);
   if (sockfd < 0)
@@ -2377,7 +2377,7 @@ get_default_gateway_mac_addr (unsigned char *macaddr)
       goto done;
     }
 
-  for (cp = buffer; cp < buffer + bufsize; )
+  for (cp = buffer; cp <= buffer + bufsize - sizeof(struct ifreq); )
     {
       ifr = (struct ifreq *)cp;
       if (ifr->ifr_addr.sa_family == AF_LINK && !strncmp(ifr->ifr_name, ifname, IFNAMSIZ))