From c979bd1dfad781c131d64b27f1de6b943d609078 Mon Sep 17 00:00:00 2001
From: Reiner Herrmann <reiner@reiner-h.de>
Date: Sat, 15 Jan 2011 03:48:20 +0100
Subject: fix typo; free more stuff

---
 src/main.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'src/main.c')

diff --git a/src/main.c b/src/main.c
index debdfb0..594805e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -22,7 +22,7 @@ int main(int argc, char **argv)
 		int* csocks;
 		struct player_list players;
 		int opponents = 3;
-		char* nickname = "deki";
+		const char* nickname = "deki";
 		servermode = true;
 		port = argv[1];
 
@@ -33,7 +33,8 @@ int main(int argc, char **argv)
 		csocks = server_get_players(ssock, opponents);
 
 		players.count = opponents + 1;
-		players.names[0] = nickname;
+		players.names[0] = malloc(strlen(nickname));
+		strcpy(players.names[0], nickname);
 
 		for(int i=0; i<opponents; i++)
 		{
@@ -46,6 +47,9 @@ int main(int argc, char **argv)
 		// start game and send player list to clients
 		server_start_game(csocks, opponents, &players);
 
+		// cleanup
+		for(int i=0; i<players->count; i++)
+			free(players.names[i]);
 		close(ssock);
 		free(csocks);
 	}
@@ -53,7 +57,7 @@ int main(int argc, char **argv)
 	{
 		int sock;
 		struct player_list* players;
-		char* nickname = "schnippi";
+		const char* nickname = "schnippi";
 		addr = argv[1];
 		port = argv[2];
 
@@ -68,8 +72,11 @@ int main(int argc, char **argv)
 		for(int i=0; i<players->count; i++)
 			printf("Player %d: %s\n", i, players->names[i]);
 
-		close(sock);
+		// cleanup
+		for(int i=0; i<players->count; i++)
+			free(players->names[i]);
 		free(players);
+		close(sock);
 	}
 
 	ui_init();
-- 
cgit v1.2.3