Fixed a side-effect bug with IPv6 addresses (thanks Xag).

diff --git a/modules/misc/network/ipv6.c b/modules/misc/network/ipv6.c
index 623b6cb8ca3525ecb6a0fa63b06d1ceae4df0d3b..ccd5fa7d2af9df031760e51ad990d683a594699e 100644 (file)
--- a/modules/misc/network/ipv6.c
+++ b/modules/misc/network/ipv6.c
@@ -2,7 +2,7 @@
  * ipv6.c: IPv6 network abstraction layer
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: ipv6.c,v 1.5 2002/11/28 23:24:15 massiot Exp $
+ * $Id: ipv6.c,v 1.6 2002/12/23 16:05:04 massiot Exp $
  *
  * Authors: Alexis Guillard <alexis.guillard@bt.com>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -85,9 +85,10 @@ vlc_module_end();
  * BuildAddr: utility function to build a struct sockaddr_in6
  *****************************************************************************/
 static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
-                      char * psz_address, int i_port )
+                      const char * psz_bind_address, int i_port )
 {
     char * psz_multicast_interface = "";
+    char * psz_address = strdup(psz_bind_address);
 
 #if defined(WIN32)
     /* Try to get getaddrinfo() and freeaddrinfo() from wship6.dll */
@@ -113,6 +114,7 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
     {
         msg_Err( p_this, "no IPv6 stack installed" );
         if( wship6_dll ) FreeLibrary( wship6_dll );
+       free( psz_address );
         return( -1 );
     }
 #endif
@@ -159,6 +161,7 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
         if( _getaddrinfo( psz_address, NULL, &hints, &res ) )
         {
             FreeLibrary( wship6_dll );
+            free( psz_address );
             return( -1 );
         }
         memcpy( &p_socket->sin6_addr,
@@ -177,6 +180,7 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
         if ( (p_hostent = gethostbyname2( psz_address, AF_INET6 )) == NULL )
         {
             msg_Err( p_this, "ipv6 error: unknown host %s", psz_address );
+            free( psz_address );
             return( -1 );
         }
 
@@ -188,6 +192,7 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
         if( _getaddrinfo( psz_address, NULL, &hints, &res ) )
         {
             FreeLibrary( wship6_dll );
+            free( psz_address );
             return( -1 );
         }
         memcpy( &p_socket->sin6_addr,
@@ -198,6 +203,7 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
 #else
         msg_Err( p_this, "ipv6 error: IPv6 address %s is invalid",
                  psz_address );
+        free( psz_address );
         return( -1 );
 #endif
     }
@@ -206,7 +212,8 @@ static int BuildAddr( vlc_object_t * p_this, struct sockaddr_in6 * p_socket,
     FreeLibrary( wship6_dll );
 #endif
 
-    return( 0 );
+    free( psz_address );
+    return 0;
 }
 
 /*****************************************************************************