From: Corey Farrell <git@cfware.com>
Date: Sat, 1 Jul 2017 04:57:31 +0000 (-0400)
Subject: channel: Clear channel flag in error branch.
X-Git-Tag: 14.6.0-rc1~4^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=584f969020b47dfbd3128b3f97dcb2fd29f307ca;p=thirdparty%2Fasterisk.git

channel: Clear channel flag in error branch.

Clear channel flag AST_FLAG_END_DTMF_ONLY in ast_waitfordigit_full when
ast_read returns NULL.

ASTERISK-27100 #close

Change-Id: Id3039e9a4e74e0cb359f636c9fd0c9740ebf7d9d
---

diff --git a/main/channel.c b/main/channel.c
index 4323aed15e..3e5674a05d 100644
--- a/main/channel.c
+++ b/main/channel.c
@@ -3557,8 +3557,12 @@ int ast_waitfordigit_full(struct ast_channel *c, int timeout_ms, int audiofd, in
 		} else if (rchan) {
 			int res;
 			struct ast_frame *f = ast_read(c);
-			if (!f)
+
+			if (!f) {
+				ast_channel_clear_flag(c, AST_FLAG_END_DTMF_ONLY);
+
 				return -1;
+			}
 
 			switch (f->frametype) {
 			case AST_FRAME_DTMF_BEGIN: