From: Mark Michelson <mmichelson@digium.com>
Date: Tue, 24 Mar 2009 22:42:00 +0000 (+0000)
Subject: Merged revisions 184079 via svnmerge from
X-Git-Tag: 1.6.1.0-rc4~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf35e2ded1a1cc9891b23a8cf53814f4401a026d;p=thirdparty%2Fasterisk.git

Merged revisions 184079 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

................
  r184079 | mmichelson | 2009-03-24 17:40:39 -0500 (Tue, 24 Mar 2009) | 15 lines

  Merged revisions 184078 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.4

  ........
    r184078 | mmichelson | 2009-03-24 17:34:45 -0500 (Tue, 24 Mar 2009) | 9 lines

    Change NULL pointer check to be ast_strlen_zero.

    The 'digit' variable is guaranteed to be non-NULL, so the if
    statement could never evaluate true. Changing to ast_strlen_zero
    makes the logic correct.

    This was found while reviewing ast_channel_ao2 code review.
  ........
................


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

diff --git a/apps/app_senddtmf.c b/apps/app_senddtmf.c
index 9863ce0121..5a64ab1b0e 100644
--- a/apps/app_senddtmf.c
+++ b/apps/app_senddtmf.c
@@ -92,7 +92,7 @@ static int manager_play_dtmf(struct mansession *s, const struct message *m)
 		astman_send_error(s, m, "Channel not specified");
 		return 0;
 	}
-	if (!digit) {
+	if (ast_strlen_zero(digit)) {
 		astman_send_error(s, m, "No digit specified");
 		ast_channel_unlock(chan);
 		return 0;