@@ -1,3 +1,7 @@

+Wed Oct  1 19:11:30 CEST 2008 (acab)

+------------------------------------

+  * clamav-milter/clamav-milter.c: fix error path segfault

+

 Tue Sep 30 18:28:28 CEST 2008 (acab)

 ------------------------------------

   * clamav-milter/clamav-milter.c: do not access _res when linking to a MT

@@ -2538,11 +2538,10 @@ findServer(void)

 		if(sock < 0) {

 			perror("socket");

-			do {

-				pthread_join(tids[i], NULL);

+			while(i--) {

 				if(socks[i].sock >= 0)

 					close(socks[i].sock);

-			} while(--i >= 0);

+			}

 			free(socks);

 			free(servers);

 			free(tids);

@@ -2554,8 +2553,9 @@ findServer(void)

 		if(pthread_create(&tids[i], NULL, try_server, &socks[i]) != 0) {

 			perror("pthread_create");

+			j = i;

 			do {

-				pthread_join(tids[i], NULL);

+				if (j!=i) pthread_join(tids[i], NULL);

 				if(socks[i].sock >= 0)

 					close(socks[i].sock);

 			} while(--i >= 0);