[asterisk-commits] tilghman: trunk r88008 - in /trunk: apps/app_meetme.c channels/chan_iax2.c

[SVN commits to the Asterisk project]

Author: tilghman
Date: Thu Nov  1 01:07:18 2007
New Revision: 88008

URL: http://svn.digium.com/view/asterisk?view=rev&rev=88008
Log:
Janitor:  use ast_free to pair calls of ast_malloc and ast_calloc
Reported by: eliel
Patch by: eliel
Closes issue #11135

Modified:
    trunk/apps/app_meetme.c
    trunk/channels/chan_iax2.c

Modified: trunk/apps/app_meetme.c
URL: http://svn.digium.com/view/asterisk/trunk/apps/app_meetme.c?view=diff&rev=88008&r1=88007&r2=88008
==============================================================================
--- trunk/apps/app_meetme.c (original)
+++ trunk/apps/app_meetme.c Thu Nov  1 01:07:18 2007
@@ -815,7 +815,7 @@
 		ast_log(LOG_WARNING, "Unable to open pseudo device\n");
 		if (cnf->fd >= 0)
 			close(cnf->fd);
-		free(cnf);
+		ast_free(cnf);
 		cnf = NULL;
 		goto cnfout;
 	}

Modified: trunk/channels/chan_iax2.c
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_iax2.c?view=diff&rev=88008&r1=88007&r2=88008
==============================================================================
--- trunk/channels/chan_iax2.c (original)
+++ trunk/channels/chan_iax2.c Thu Nov  1 01:07:18 2007
@@ -2206,7 +2206,7 @@
 							/* Hangup the fd */
 							fr.frametype = AST_FRAME_CONTROL;
 							fr.subclass = AST_CONTROL_HANGUP;
-							iax2_queue_frame(callno, &fr); // XXX
+							iax2_queue_frame(callno, &fr); /* XXX */
 							/* Remember, owner could disappear */
 							if (iaxs[callno] && iaxs[callno]->owner)
 								iaxs[callno]->owner->hangupcause = AST_CAUSE_DESTINATION_OUT_OF_ORDER;
@@ -6037,7 +6037,7 @@
 				}
 			}
 			if (prev)
-				free(prev);
+				ast_free(prev);
 			ies->vars = NULL;
 			ast_channel_datastore_add(p->owner, variablestore);
 		} else {
@@ -7828,7 +7828,7 @@
 							}
 						}
 						if (prev)
-							free(prev);
+							ast_free(prev);
 						ies.vars = NULL;
 						ast_channel_datastore_add(c, variablestore);
 					} else {
@@ -8586,7 +8586,7 @@
 										}
 									}
 									if (prev)
-										free(prev);
+										ast_free(prev);
 									ies.vars = NULL;
 									ast_channel_datastore_add(c, variablestore);
 								} else {