From: Mark Spencer <markster@digium.com>
Date: Mon, 30 May 2005 13:34:23 +0000 (+0000)
Subject: Fix memory leak and remove useless coe (bug #4318, with mods)
X-Git-Tag: 1.2.0-beta1~562
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=586c677bc28dfc511bf7321f5765d266d8dd5963;p=thirdparty%2Fasterisk.git

Fix memory leak and remove useless coe (bug #4318, with mods)


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

diff --git a/apps/app_queue.c b/apps/app_queue.c
index e5cba679bf..06dcd061b0 100755
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -1300,21 +1300,26 @@ static struct localuser *wait_for_answer(struct queue_ent *qe, struct localuser
 			if (!f || ((f->frametype == AST_FRAME_CONTROL) && (f->subclass == AST_CONTROL_HANGUP))) {
 				/* Got hung up */
 				*to=-1;
+				if (f)
+					ast_frfree(f);
 				return NULL;
 			}
-			if (f && (f->frametype == AST_FRAME_DTMF) && caller_disconnect && (f->subclass == '*')) {
+			if ((f->frametype == AST_FRAME_DTMF) && caller_disconnect && (f->subclass == '*')) {
 				if (option_verbose > 3)
 					ast_verbose(VERBOSE_PREFIX_3 "User hit %c to disconnect call.\n", f->subclass);
 				*to=0;
+				ast_frfree(f);
 				return NULL;
 			}
-			if (f && (f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) {
+			if ((f->frametype == AST_FRAME_DTMF) && (f->subclass != '*') && valid_exit(qe, f->subclass)) {
 				if (option_verbose > 3)
 					ast_verbose(VERBOSE_PREFIX_3 "User pressed digit: %c\n", f->subclass);
 				*to=0;
 				*digit=f->subclass;
+				ast_frfree(f);
 				return NULL;
 			}
+			ast_frfree(f);
 		}
 		if (!*to && (option_verbose > 2))
 			ast_verbose( VERBOSE_PREFIX_3 "Nobody picked up in %d ms\n", orig);