aboutsummaryrefslogtreecommitdiffstats
path: root/include/asterisk
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-01 16:57:16 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2008-04-01 16:57:16 +0000
commita99d42216967b0506e6e27dd545a701e43d280ab (patch)
treef224a688eb9974ac565ba7e89e4acc5e1a3d181e /include/asterisk
parent54dd0f3b20c1654a1637c7309e9270393969a2a4 (diff)
Merged revisions 112126 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ................ r112126 | file | 2008-04-01 13:50:37 -0300 (Tue, 01 Apr 2008) | 13 lines Merged revisions 112125 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r112125 | file | 2008-04-01 13:45:14 -0300 (Tue, 01 Apr 2008) | 5 lines Ensure that we do not exceed the hold's maximum size with a single frame. (closes issue #12047) Reported by: fabianoheringer Tested by: fabianoheringer ........ ................ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@112127 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk')
-rw-r--r--include/asterisk/slinfactory.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h
index 603c648c7..1f0504040 100644
--- a/include/asterisk/slinfactory.h
+++ b/include/asterisk/slinfactory.h
@@ -28,10 +28,12 @@
extern "C" {
#endif
+#define AST_SLINFACTORY_MAX_HOLD 1280
+
struct ast_slinfactory {
AST_LIST_HEAD_NOLOCK(, ast_frame) queue;
struct ast_trans_pvt *trans;
- short hold[1280];
+ short hold[AST_SLINFACTORY_MAX_HOLD];
short *offset;
size_t holdlen; /*!< in samples */
unsigned int size; /*!< in samples */