From: Anthony Minessale <anthm@freeswitch.org>
Date: Thu, 23 Sep 2010 18:31:53 +0000 (-0500)
Subject: fix switch_ivr_collect_digits_callback to allow an args pointer with null callback... 
X-Git-Tag: v1.2-rc1~291^2~40^2~62
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89d99a919608d52cc3811da82ac22379eb8ebbc7;p=thirdparty%2Ffreeswitch.git

fix switch_ivr_collect_digits_callback to allow an args pointer with null callback to work like other apis
---

diff --git a/src/switch_ivr.c b/src/switch_ivr.c
index 3d2a79c018..246b18ea4c 100644
--- a/src/switch_ivr.c
+++ b/src/switch_ivr.c
@@ -876,7 +876,7 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
 	switch_time_t abs_started = 0, digit_started = 0;
 	uint32_t abs_elapsed = 0, digit_elapsed = 0;
 
-	if (!args || !args->input_callback) {
+	if (!args) {
 		return SWITCH_STATUS_GENERR;
 	}
 
@@ -917,6 +917,10 @@ SWITCH_DECLARE(switch_status_t) switch_ivr_collect_digits_callback(switch_core_s
 
 
 		if (switch_channel_has_dtmf(channel)) {
+			if (!args->input_callback && !args->buf) {
+				status = SWITCH_STATUS_BREAK;
+				break;
+			}
 			switch_channel_dequeue_dtmf(channel, &dtmf);
 			status = args->input_callback(session, (void *) &dtmf, SWITCH_INPUT_TYPE_DTMF, args->buf, args->buflen);
 			if (digit_timeout) {