Merged revisions 139213 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 20 Aug 2008 22:16:36 +0000 (22:16 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 20 Aug 2008 22:16:36 +0000 (22:16 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r139213 | russell | 2008-08-20 17:14:35 -0500 (Wed, 20 Aug 2008) | 11 lines

Fix a crash in the ChanSpy application.  The issue here is that if you call
ChanSpy and specify a spy group, and sit in the application long enough looping
through the channel list, you will eventually run out of stack space and the
application with exit with a seg fault.  The backtrace was always inside of
a harmless snprintf() call, so it was tricky to track down.  However, it turned
out that the call to snprintf() was just the biggest stack consumer in this
code path, so it would always be the first one to hit the boundary.

(closes issue #13338)
Reported by: ruddy

........

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

apps/app_chanspy.c

index 81b1931..dea2017 100644 (file)
@@ -713,7 +713,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
                        char *groups[NUM_SPYGROUPS];
                        char *mygroups[NUM_SPYGROUPS];
                        int num_groups = 0;
                        char *groups[NUM_SPYGROUPS];
                        char *mygroups[NUM_SPYGROUPS];
                        int num_groups = 0;
-                       char *dup_group;
+                       char dup_group[512];
                        int num_mygroups = 0;
                        char *dup_mygroup;
                        int x;
                        int num_mygroups = 0;
                        char *dup_mygroup;
                        int x;
@@ -757,7 +757,7 @@ static int common_exec(struct ast_channel *chan, struct ast_flags *flags,
                                        ARRAY_LEN(mygroups));
 
                                if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) {
                                        ARRAY_LEN(mygroups));
 
                                if ((group = pbx_builtin_getvar_helper(peer, "SPYGROUP"))) {
-                                       dup_group = ast_strdupa(group);
+                                       ast_copy_string(dup_group, group, sizeof(dup_group));
                                        num_groups = ast_app_separate_args(dup_group, ':', groups,
                                                ARRAY_LEN(groups));
                                }
                                        num_groups = ast_app_separate_args(dup_group, ':', groups,
                                                ARRAY_LEN(groups));
                                }