pidgin: dc47c121: Rationalize nat_pmp.c:default_gw() and f...

[elb at pidgin.im]

----------------------------------------------------------------------
Revision: dc47c12109d5d42c8d34d4862016c2d98a684d68
Parent:   b728085a15101c0f1edcc91c3ce4687208dbb0a5
Author:   elb at pidgin.im
Date:     08/15/11 00:16:23
Branch:   im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/dc47c12109d5d42c8d34d4862016c2d98a684d68

Changelog: 

Rationalize nat_pmp.c:default_gw() and free leaked buffer.

Thanks to Thijs Alkemade for finding this problem.

Fixes #14424

Changes against parent b728085a15101c0f1edcc91c3ce4687208dbb0a5

  patched  libpurple/nat-pmp.c

-------------- next part --------------
============================================================
--- libpurple/nat-pmp.c	b887eb1179c1c09a7d1544798366959bf65743f9
+++ libpurple/nat-pmp.c	449a864a077ace3327011b0d43db7daad3a0a732
@@ -182,7 +182,6 @@ default_gw()
     struct rt_msghdr *rtm;
     struct sockaddr *sa;
 	struct sockaddr_in *sin = NULL;
-	gboolean found = FALSE;
 
     mib[0] = CTL_NET;
     mib[1] = PF_ROUTE; /* entire routing table or a subset of it */
@@ -207,6 +206,7 @@ default_gw()
 	/* Read the routing table into buf */
     if (sysctl(mib, 6, buf, &needed, NULL, 0) < 0)
 	{
+		free(buf);
 		purple_debug_warning("nat-pmp", "sysctl: net.route.0.0.dump\n");
 		return NULL;
     }
@@ -220,9 +220,10 @@ default_gw()
 
 		if (sa->sa_family == AF_INET)
 		{
-			sin = (struct sockaddr_in*) sa;
+			struct sockaddr_in *cursin = (struct sockaddr_in*) sa;
 
-			if ((rtm->rtm_flags & RTF_GATEWAY) && sin->sin_addr.s_addr == INADDR_ANY)
+			if ((rtm->rtm_flags & RTF_GATEWAY)
+			    && cursin->sin_addr.s_addr == INADDR_ANY)
 			{
 				/* We found the default route. Now get the destination address and netmask. */
 	            struct sockaddr *rti_info[RTAX_MAX];
@@ -251,7 +252,6 @@ default_gw()
 						memcpy(sin, rti_info[RTAX_GATEWAY], sizeof(struct sockaddr_in));
 
 						purple_debug_info("nat-pmp", "Found a default gateway\n");
-						found = TRUE;
 						break;
 					}
 				}
@@ -259,7 +259,8 @@ default_gw()
 		}
     }
 
-	return (found ? sin : NULL);
+	free(buf);
+	return sin;
 }
 
 /*!