From: Russell Bryant <russell@russellbryant.com>
Date: Mon, 15 Oct 2007 15:47:46 +0000 (+0000)
Subject: Merged revisions 85556 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~1200
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3f2e8db598cb16ddfdb2fa4b71c4bb99f6354e04;p=thirdparty%2Fasterisk.git

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

........
r85556 | russell | 2007-10-15 10:40:45 -0500 (Mon, 15 Oct 2007) | 9 lines

Ensure the buffer passed to ast_canmatch_extension() is properly initialized so
that it is null terminated.

(issue #10977)
Reported by: dimas
Patches:
      pbxdundi.patch uploaded by dimas (license 88)
	    - small mods by me

........


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

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index c2851eef23..860690f09b 100644
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -596,8 +596,8 @@ static int dundi_lookup_local(struct dundi_result *dr, struct dundi_mapping *map
 		} else {
 			/* No answers...  Find the fewest number of digits from the
 			   number for which we have no answer. */
-			char tmp[AST_MAX_EXTENSION];
-			for (x=0;x<AST_MAX_EXTENSION;x++) {
+			char tmp[AST_MAX_EXTENSION + 1] = "";
+			for (x = 0; x < (sizeof(tmp) - 1); x++) {
 				tmp[x] = called_number[x];
 				if (!tmp[x])
 					break;