X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fchannel.c;h=ec331bb1cca9b83b5daa3a04edaa6b36ca117825;hb=a0263cad8675800030a33dacf38d881fa647d0af;hp=54b57a27a21421da214b04d53c8c3d7b05c28af3;hpb=8299f488088878d38ccf7ba9bbccc4743e48bd13;p=umurmur.git

diff --git a/src/channel.c b/src/channel.c
index 54b57a2..ec331bb 100644
--- a/src/channel.c
+++ b/src/channel.c
@@ -32,6 +32,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include "log.h"
+#include "memory.h"
 #include "list.h"
 #include "client.h"
 #include "channel.h"
@@ -46,10 +47,7 @@ static channel_t *createChannel(int id, const char *name, const char *desc)
 {
 	channel_t *ch;
 
-	ch = malloc(sizeof(channel_t));
-	if (ch == NULL)
-		Log_fatal("out of memory");
-	memset(ch, 0, sizeof(channel_t));
+	ch = Memory_safeCalloc(1, sizeof(channel_t));
 	ch->id = id;
 	ch->name = strdup(name);
 	if (desc)
@@ -196,6 +194,7 @@ void Chan_init()
 	/* Channel links */
 	for (i = 0; ; i++) {
 		channel_t *ch_src, *ch_dst, *ch_itr = NULL;
+		channellist_t *chl;
 		if (Conf_getNextChannelLink(&chlink, i) < 0) {
 			if (i == 0)
 				Log_info("No channel links found in configuration file.");
@@ -221,7 +220,10 @@ void Chan_init()
 		else
 			ch_dst = ch_itr;
 
-		list_add_tail(&ch_dst->link_node, &ch_src->channel_links);
+		chl = Memory_safeMalloc(1, sizeof(channellist_t));
+		chl->chan = ch_dst;
+		init_list_entry(&chl->node);
+		list_add_tail(&chl->node, &ch_src->channel_links);
 		ch_src->linkcount++;
 		Log_info("Adding channel link '%s' -> '%s'", ch_src->name, ch_dst->name);
 	}
@@ -230,6 +232,7 @@ void Chan_init()
 void Chan_free()
 {
 	struct dlist *itr, *save;
+	struct dlist *linkitr, *linksave;
 	channel_t *ch;
 
 	list_iterate_safe(itr, save, &channels) {
@@ -240,6 +243,11 @@ void Chan_free()
 			free(ch->desc);
 		if (ch->password)
 			free(ch->password);
+		list_iterate_safe(linkitr, linksave, &ch->channel_links) {
+			channellist_t *chl;
+			chl = list_get_entry(linkitr, channellist_t, node);
+			free(chl);
+		}
 		free(ch);
 	}
 }
@@ -274,7 +282,7 @@ int Chan_userLeave(client_t *client)
 
 	if (client->channel) {
 		list_del(&client->chan_node);
-		leaving = (channel_t *)client->channel;
+		leaving = client->channel;
 		if (leaving->temporary && list_empty(&leaving->clients)) {
 			leaving_id = leaving->id;
 			Chan_freeChannel(leaving);
@@ -288,14 +296,14 @@ int Chan_userJoin(channel_t *ch, client_t *client)
 	int leaving_id;
 
 	/* Do nothing if user already is in this channel */
-	if ((channel_t *)client->channel == ch)
+	if (client->channel == ch)
 		return 0;
 
 	Log_debug("Add user %s to channel %s", client->username, ch->name);
 	/* Only allowed in one channel at a time */
 	leaving_id = Chan_userLeave(client);
 	list_add_tail(&client->chan_node, &ch->clients);
-	client->channel = (void *)ch;
+	client->channel = ch;
 	return leaving_id;
 }
 
@@ -370,7 +378,7 @@ void Chan_buildTreeList(channel_t *ch, struct dlist *head)
 	struct dlist *itr;
 	channel_t *sub;
 
-	chl = malloc(sizeof(channellist_t));
+	chl = Memory_safeMalloc(1, sizeof(channellist_t));
 	chl->chan = ch;
 	init_list_entry(&chl->node);
 	list_add_tail(&chl->node, head);