xnu-3789.41.3.tar.gz

[apple/xnu.git] / bsd / net / multicast_list.c

diff --git a/bsd/net/multicast_list.c b/bsd/net/multicast_list.c
index a58cb912d7442269a5ef8c893ba847cd9472d023..e91aeeb11a988eb856d98c27ede170bc99b7a1ca 100644 (file)
--- a/bsd/net/multicast_list.c
+++ b/bsd/net/multicast_list.c
@@ -1,14 +1,19 @@
 /*
- * Copyright (c) 2004 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2004-2010 Apple Inc. All rights reserved.
  *
- * @APPLE_LICENSE_HEADER_START@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
@@ -18,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@
  */
 
 /*
@@ -125,6 +130,10 @@ multicast_list_program(struct multicast_list * mc_list,
            continue;
        }
        mc = _MALLOC(sizeof(struct multicast_entry), M_DEVBUF, M_WAITOK);
+       if (mc == NULL) {
+               error = ENOBUFS;
+               break;
+       }
        bcopy(LLADDR(&source_sdl), LLADDR(&target_sdl), alen);
        error = ifnet_add_multicast(target_ifp, (struct sockaddr *)&target_sdl, 
                                    &mc->mc_ifma);
@@ -142,5 +151,6 @@ multicast_list_program(struct multicast_list * mc_list,
        (void)multicast_list_remove(mc_list);
        *mc_list = new_mc_list;
     }
+    ifnet_free_multicast_list(source_multicast_list);
     return (error);
 }