[Asterisk-cvs] asterisk/res res_musiconhold.c,1.65,1.66

[markster at lists.digium.com]

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

Modified Files:
	res_musiconhold.c 
Log Message:
Fix music on hold leak (bug #4842)


Index: res_musiconhold.c
===================================================================
RCS file: /usr/cvsroot/asterisk/res/res_musiconhold.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- res_musiconhold.c	15 Jul 2005 23:00:47 -0000	1.65
+++ res_musiconhold.c	28 Jul 2005 18:37:55 -0000	1.66
@@ -140,6 +140,22 @@
 #define MPG_123 "/usr/bin/mpg123"
 #define MAX_MP3S 256
 
+
+static void ast_moh_free_class(struct mohclass **class) 
+{
+	struct mohdata *members, *mtmp;
+	
+	members = (*class)->members;
+	while(members) {
+		mtmp = members;
+		members = members->next;
+		free(mtmp);
+	}
+	free(*class);
+	*class = NULL;
+}
+
+
 static void moh_files_release(struct ast_channel *chan, void *data)
 {
 	struct moh_files_state *state = chan->music_state;
@@ -776,7 +792,7 @@
 		if (param)
 			strncpy(moh->dir, param, sizeof(moh->dir) - 1);
 		if (!moh_scan_files(moh)) {
-			free(moh);
+			ast_moh_free_class(&moh);
 			return -1;
 		}
 	} else if (!strcasecmp(mode, "mp3") || !strcasecmp(mode, "mp3nb") || !strcasecmp(mode, "quietmp3") || !strcasecmp(mode, "quietmp3nb") || !strcasecmp(mode, "httpmp3") || !strcasecmp(mode, "custom")) {
@@ -809,12 +825,12 @@
 			ast_log(LOG_WARNING, "Unable to create moh...\n");
 			if (moh->pseudofd > -1)
 				close(moh->pseudofd);
-			free(moh);
+			ast_moh_free_class(&moh);
 			return -1;
 		}
 	} else {
 		ast_log(LOG_WARNING, "Don't know how to do a mode '%s' music on hold\n", mode);
-		free(moh);
+		ast_moh_free_class(&moh);
 		return -1;
 	}
 	ast_mutex_lock(&moh_lock);
@@ -915,7 +931,7 @@
 
 static void ast_moh_destroy(void)
 {
-	struct mohclass *moh,*tmp;
+	struct mohclass *moh, *tmp;
 	char buff[8192];
 	int bytes, tbytes=0, stime = 0, pid = 0;
 
@@ -939,7 +955,7 @@
 		}
 		tmp = moh;
 		moh = moh->next;
-		free(tmp);
+		ast_moh_free_class(&tmp);
 	}
 	mohclasses = NULL;
 	ast_mutex_unlock(&moh_lock);