diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-20 22:19:33 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-08-20 22:19:33 +0000 |
| commit | e0f67458b9315bc7adc98c8d1c0a300d591cb897 (patch) | |
| tree | 311bc237d74f7fa9dc59b88348e8bc824c5bb89e /apps/app_chanspy.c | |
| parent | f4674f3217f3423651bd6ec3be3c0b4da579957f (diff) | |
Merged revisions 139215 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r139215 | russell | 2008-08-20 17:16:36 -0500 (Wed, 20 Aug 2008) | 19 lines
Merged revisions 139213 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.1@139217 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'apps/app_chanspy.c')
| -rw-r--r-- | apps/app_chanspy.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/app_chanspy.c b/apps/app_chanspy.c index 81b193110..dea2017ea 100644 --- a/apps/app_chanspy.c +++ b/apps/app_chanspy.c @@ -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 *dup_group; + char dup_group[512]; 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"))) { - 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)); } |