[Asterisk-cvs] asterisk/res res_musiconhold.c,1.10,1.11

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/res
In directory mongoose.digium.com:/tmp/cvs-serv6523/res

Modified Files:
	res_musiconhold.c 
Log Message:
Handle mpg123 failures without leaking fd's


Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- res_musiconhold.c	27 Sep 2003 02:45:37 -0000	1.10
+++ res_musiconhold.c	4 Nov 2003 23:23:00 -0000	1.11
@@ -163,6 +163,8 @@
 #endif	
 	if (!files) {
 		ast_log(LOG_WARNING, "Found no files in '%s'\n", class->dir);
+		close(fds[0]);
+		close(fds[1]);
 		return -1;
 	}
 	class->pid = fork();
@@ -189,6 +191,7 @@
 		/* Check PATH as a last-ditch effort */
 		execvp("mpg123", argv);
 		ast_log(LOG_WARNING, "Exec failed: %s\n", strerror(errno));
+		close(fds[1]);
 		exit(1);
 	} else {
 		/* Parent */