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 e5cba679bfd9ea483d77d60069b1221debce1327..06dcd061b079525be86bc5f6ff13218b8129520f 100755 (executable)
--- 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);