diff options
| author | Joshua Colp <jcolp@digium.com> | 2008-04-07 14:54:42 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2008-04-07 14:54:42 +0000 |
| commit | c7d51a7fc16ea838b3f8aa31cb58a1e2391bec1b (patch) | |
| tree | 8c363781015b35454b3616619dcce1889e561d23 /main/slinfactory.c | |
| parent | eb930d5eddbde7d9da5efc4b61d21276b302b0e6 (diff) | |
Put my slinfactory changes back in.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@113009 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 6c1bdd6f9..af70399e6 100644 --- a/main/slinfactory.c +++ b/main/slinfactory.c @@ -172,6 +172,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; } |