From: Automerge script <automerge@asterisk.org>
Date: Tue, 9 Oct 2012 22:25:47 +0000 (+0000)
Subject: Merged revisions 374763 via svnmerge from
X-Git-Tag: 10.11.0-digiumphones-rc1~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4aa17120d3b14a92ebc130ad14fbf47fb9ede7da;p=thirdparty%2Fasterisk.git

Merged revisions 374763 via svnmerge from
file:///srv/subversion/repos/asterisk/branches/10

................
  r374763 | rmudgett | 2012-10-09 17:19:26 -0500 (Tue, 09 Oct 2012) | 15 lines

  Fix execution of 'i' extension due to uninitialized variable.

  The fix for ASTERISK-18243 added code that could potentially use
  dst_exten[] uninitialized.  As a result the 'i' exten may not be executed
  when it should.

  (closes issue ASTERISK-20455)
  Reported by: Richard Miller
  Patches:
        pbx-1.8.16.0.diff (license #5685) patch uploaded by Richard Miller
        Made some cosmetic modifications.
  ........

  Merged revisions 374758 from http://svn.asterisk.org/svn/asterisk/branches/1.8
................


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

diff --git a/main/pbx.c b/main/pbx.c
index d8dc8aa43f..134dda63b8 100644
--- a/main/pbx.c
+++ b/main/pbx.c
@@ -5440,6 +5440,9 @@ static enum ast_pbx_result __ast_pbx_run(struct ast_channel *c,
 		int invalid = 0;
 		int timeout = 0;
 
+		/* No digits pressed yet */
+		dst_exten[pos] = '\0';
+
 		/* loop on priorities in this context/exten */
 		while (!(res = ast_spawn_extension(c, c->context, c->exten, c->priority,
 			S_COR(c->caller.id.number.valid, c->caller.id.number.str, NULL),