X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fmessagehandler.c;h=e93afb99ab488ad894dfd45fe8dc3a26f300455b;hb=c2eec4582ad6f5f759d8b9a3c7f9bf78aa59f656;hp=696cad3c6d750f90f642ee2c5aa734b07b9f0be1;hpb=b331021d492fd5febb576a61717a489c5cc875ff;p=umurmur.git

diff --git a/src/messagehandler.c b/src/messagehandler.c
index 696cad3..e93afb9 100644
--- a/src/messagehandler.c
+++ b/src/messagehandler.c
@@ -285,9 +285,14 @@ void Mh_handle_message(client_t *client, message_t *msg)
 				sendmsg->payload.channelState->n_links = ch_itr->linkcount;
 
 				links = (uint32_t *)malloc(ch_itr->linkcount * sizeof(uint32_t));
+				if(!links)
+					Log_fatal("Out of memory");
+
 				list_iterate(itr, &ch_itr->channel_links) { /* Iterate links */
+					channellist_t *chl;
 					channel_t *ch;
-					ch = list_get_entry(itr, channel_t, link_node);
+					chl = list_get_entry(itr, channellist_t, node);
+					ch = chl->chan;
 					links[i++] = ch->id;
 				}
 				sendmsg->payload.channelState->links = links;