X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=server.c;h=a4115eb65734391128481f6fa421d548aba78e20;hp=1e4caf08c90d0e04233a987f6e520e19850c20c5;hb=ad81d625737e1c096c154aedd8a1d161d3ee592e;hpb=1c4fca3000b98973a433bfd80290d159fd6696a7

diff --git a/server.c b/server.c
index 1e4caf08..a4115eb6 100644
--- a/server.c
+++ b/server.c
@@ -352,6 +352,8 @@ static void command_post_select(struct sched *s, struct task *t)
 	int new_fd, ret, i;
 	char *peer_name;
 	pid_t child_pid;
+	uint32_t *chunk_table;
+	char *info_string;
 
 	if (!FD_ISSET(sct->listen_fd, &s->rfds))
 		return;
@@ -364,6 +366,16 @@ static void command_post_select(struct sched *s, struct task *t)
 	mmd->num_connects++;
 	mmd->active_connections++;
 	random();
+	/* The chunk table and the info_string are pointers located in the
+	 * mmd struct that point to dynamically allocated memory that must be
+	 * freed by the parent and the child. However, as the mmd struct is in
+	 * a shared memory area, there's no guarantee that after the fork these
+	 * pointers are still valid in child context. As these two pointers are
+	 * not used in the child anyway, we save them to local variables and
+	 * free the memory via that copy in the child.
+	 */
+	info_string = mmd->afd.afhi.info_string;
+	chunk_table = mmd->afd.afhi.chunk_table;
 	child_pid = fork();
 	if (child_pid < 0) {
 		ret = -ERRNO_TO_PARA_ERROR(errno);
@@ -374,6 +386,9 @@ static void command_post_select(struct sched *s, struct task *t)
 		/* parent keeps accepting connections */
 		return;
 	}
+	/* mmd might already have changed at this point */
+	free(info_string);
+	free(chunk_table);
 	alarm(ALARM_TIMEOUT);
 	close_listed_fds();
 	para_signal_shutdown();