From 346c1b5ae67c482db7f3f94a96f05a642bd36433 Mon Sep 17 00:00:00 2001 From: Joshua Colp Date: Tue, 1 Apr 2008 16:57:16 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@112127 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/slinfactory.h | 4 +++- main/slinfactory.c | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/include/asterisk/slinfactory.h b/include/asterisk/slinfactory.h index 603c648c77..1f05040405 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 */ diff --git a/main/slinfactory.c b/main/slinfactory.c index adec9f3e85..0d6e81b680 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; }