diff options
| author | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 16:57:16 +0000 |
|---|---|---|
| committer | file <file@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-04-01 16:57:16 +0000 |
| commit | a99d42216967b0506e6e27dd545a701e43d280ab (patch) | |
| tree | f224a688eb9974ac565ba7e89e4acc5e1a3d181e /main/slinfactory.c | |
| parent | 54dd0f3b20c1654a1637c7309e9270393969a2a4 (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 'main/slinfactory.c')
| -rw-r--r-- | main/slinfactory.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/main/slinfactory.c b/main/slinfactory.c index adec9f3e8..0d6e81b68 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -137,6 +137,9 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples) memcpy(offset, frame_data, ineed * sizeof(*offset)); sofar += ineed; frame_data += ineed; + if (remain > (AST_SLINFACTORY_MAX_HOLD - sf->holdlen)) { + remain = AST_SLINFACTORY_MAX_HOLD - sf->holdlen; + } memcpy(sf->hold, frame_data, remain * sizeof(*offset)); sf->holdlen = remain; } |