kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-03 20:38:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 112126 via svnmerge from

Browse Source 
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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112127 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2008-04-01 16:57:16 +00:00
parent 4358d42970
commit 346c1b5ae6
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/asterisk/slinfactory.h
View File

@@ -28,10 +28,12 @@
extern "C" { extern "C" {
#endif #endif
#define AST_SLINFACTORY_MAX_HOLD 1280
struct ast_slinfactory { struct ast_slinfactory {
AST_LIST_HEAD_NOLOCK(, ast_frame) queue; AST_LIST_HEAD_NOLOCK(, ast_frame) queue;
struct ast_trans_pvt *trans; struct ast_trans_pvt *trans;
short hold[1280]; short hold[AST_SLINFACTORY_MAX_HOLD];
short *offset; short *offset;
size_t holdlen; /*!< in samples */ size_t holdlen; /*!< in samples */
unsigned int size; /*!< in samples */ unsigned int size; /*!< in samples */

3
main/slinfactory.c
View File

@@ -137,6 +137,9 @@ int ast_slinfactory_read(struct ast_slinfactory *sf, short *buf, size_t samples)
memcpy(offset, frame_data, ineed * sizeof(*offset)); memcpy(offset, frame_data, ineed * sizeof(*offset));
sofar += ineed; sofar += ineed;
frame_data += 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)); memcpy(sf->hold, frame_data, remain * sizeof(*offset));
sf->holdlen = remain; sf->holdlen = remain;
} }