Merged revisions 85556 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Mon, 15 Oct 2007 15:47:46 +0000 (15:47 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 15 Oct 2007 15:47:46 +0000 (15:47 +0000)
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

pbx/pbx_dundi.c

index c2851ee..860690f 100644 (file)
@@ -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;