From 193282c8dd4c2014a7be7f930774cd261867f8b2 Mon Sep 17 00:00:00 2001 From: file Date: Tue, 1 Apr 2008 16:50:37 +0000 Subject: 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/trunk@112126 f38db490-d61c-443f-a65b-d21fe96a405b --- main/slinfactory.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'main/slinfactory.c') 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; } -- cgit v1.2.3