Janitor: use ast_free to pair calls of ast_malloc and ast_calloc

Reported by: eliel
Patch by: eliel
Closes issue #11135

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@88008 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_meetme.c b/apps/app_meetme.c
index 7b67d6b23441983f8939aae70be1c04e5fe03b30..1676b6d29b17f0cd1c853c6f2af9b9426aa214dc 100644 (file)
--- a/apps/app_meetme.c
+++ b/apps/app_meetme.c
@@ -815,7 +815,7 @@ static struct ast_conference *build_conf(char *confno, char *pin, char *pinadmin
                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;
        }

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index d2707bc4d1b7e5e6a210fc5f03c272e4b1f0d8fe..dff41ecb2ddb0755e88f03183df5d5e1543826ea 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -2206,7 +2206,7 @@ static void __attempt_transmit(const void *data)
                                                        /* 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 @@ static int authenticate_reply(struct chan_iax2_pvt *p, struct sockaddr_in *sin,
                                }
                        }
                        if (prev)
-                               free(prev);
+                               ast_free(prev);
                        ies->vars = NULL;
                        ast_channel_datastore_add(p->owner, variablestore);
                } else {
@@ -7828,7 +7828,7 @@ static int socket_process(struct iax2_thread *thread)
                                                        }
                                                }
                                                if (prev)
-                                                       free(prev);
+                                                       ast_free(prev);
                                                ies.vars = NULL;
                                                ast_channel_datastore_add(c, variablestore);
                                        } else {
@@ -8586,7 +8586,7 @@ retryowner2:
                                                                                }
                                                                        }
                                                                        if (prev)
-                                                                               free(prev);
+                                                                               ast_free(prev);
                                                                        ies.vars = NULL;
                                                                        ast_channel_datastore_add(c, variablestore);
                                                                } else {