[Freeswitch-trunk] [commit] r3679 - freeswitch/trunk/src/mod/applications/mod_conference

[Freeswitch SVN]

Author: anthm
Date: Sat Dec 16 17:47:41 2006
New Revision: 3679

Modified:
   freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c

Log:
doh

Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c
==============================================================================
--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	(original)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c	Sat Dec 16 17:47:41 2006
@@ -2052,6 +2052,7 @@
 	char *lbuf = NULL;
 	switch_status_t status = SWITCH_STATUS_SUCCESS;
 	char *http = NULL;
+    switch_memory_pool_t *pool = NULL;
 
 	if (session) {
 		return SWITCH_STATUS_FALSE;
@@ -2445,6 +2446,10 @@
 					}
 				} else if (!strcasecmp(argv[1], "transfer")) {
 					char *transfer_usage = "Usage transfer <confname> <id> [..<idN>]\n";
+                    if (switch_strlen_zero(argv[2])) {
+                        stream->write_function(stream, transfer_usage);
+                        goto done;
+                    }
 					if (argc > 3) {
                         int x = 0;
                         for(x = 3; x < argc; x++) {
@@ -2464,7 +2469,6 @@
                             channel = switch_core_session_get_channel(member->session);
 
                             if (!(new_conference = (conference_obj_t *) switch_core_hash_find(globals.conference_hash, argv[2]))) {
-                                switch_memory_pool_t *pool;
                                 char *conf_name;
 
                                 /* Setup a memory pool to use. */
@@ -2511,6 +2515,7 @@
                                 /* Indicate the conference is dynamic */
                                 switch_set_flag_locked(new_conference, CFLAG_DYNAMIC);
 
+                                pool = NULL;
                                 /* Start the conference thread for this conference */
                                 launch_conference_thread(new_conference);
                             }
@@ -2638,12 +2643,12 @@
 		stream->write_function(stream, "Memory Error!\n");
 	}
 
-done:
+ done:
 
-	if (lbuf) {
-		free(lbuf);
+    switch_safe_free(lbuf);
+	if (pool) {
+		switch_core_destroy_memory_pool(&pool);
 	}
-
 	return status;
 
 }