r4088: Get medieval on our ass about malloc.... :-). Take control of all our allocation

[samba.git] / source3 / nmbd / nmbd_nameregister.c

diff --git a/source3/nmbd/nmbd_nameregister.c b/source3/nmbd/nmbd_nameregister.c
index 4e11881f063876ed905bf9bf1a65ea1801102bef..8f2a88925421c96b15b55d49b6f96b93f12ef9eb 100644 (file)
--- a/source3/nmbd/nmbd_nameregister.c
+++ b/source3/nmbd/nmbd_nameregister.c
@@ -306,7 +306,7 @@ static void multihomed_register_one(struct nmb_name *nmbname,
        struct in_addr wins_ip = wins_srv_ip_tag(tag, ip);
        fstring ip_str;
 
-       userdata = (struct userdata_struct *)malloc(sizeof(*userdata) + strlen(tag) + 1);
+       userdata = (struct userdata_struct *)SMB_MALLOC(sizeof(*userdata) + strlen(tag) + 1);
        if (!userdata) {
                DEBUG(0,("Failed to allocate userdata structure!\n"));
                return;
@@ -423,7 +423,7 @@ static void multihomed_register_name(struct nmb_name *nmbname, uint16 nb_flags,
        for(subrec = FIRST_SUBNET; subrec; subrec = NEXT_SUBNET_EXCLUDING_UNICAST(subrec) )
                num_ips++;
        
-       if((ip_list = (struct in_addr *)malloc(num_ips * sizeof(struct in_addr)))==NULL) {
+       if((ip_list = SMB_MALLOC_ARRAY(struct in_addr, num_ips))==NULL) {
                DEBUG(0,("multihomed_register_name: malloc fail !\n"));
                return;
        }